X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound%2Foss%2Fkahlua.c;h=dfe670f12e67d71117904db746c2a2b8e87af10d;hb=2714d9a6d1e68d30f5be8871722a7cff388c2d74;hp=2835a7c038efadfa5163e07748a914d95f0428ee;hpb=9fdb62af92c741addbea15545f214a6e89460865;p=linux-2.6

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 2835a7c038..dfe670f12e 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -27,7 +27,6 @@
  *	same manner.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -140,13 +139,12 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
 	printk(KERN_INFO "kahlua: XpressAudio on IRQ %d, DMA %d, %d\n",
 		irq, dma8, dma16);
 	
-	hw_config = kmalloc(sizeof(struct address_info), GFP_KERNEL);
+	hw_config = kzalloc(sizeof(struct address_info), GFP_KERNEL);
 	if(hw_config == NULL)
 	{
 		printk(KERN_ERR "kahlua: out of memory.\n");
 		return 1;
 	}
-	memset(hw_config, 0, sizeof(*hw_config));
 	
 	pci_set_drvdata(pdev, hw_config);