X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Firda%2Firda_device.c;h=e3debbdb67f5a0272db139cda75eef326e0db71b;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=7e7a31798d8d04855fead92b2ebdb444f85ea26a;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 7e7a31798..e3debbdb6 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -29,6 +29,7 @@
  *
  ********************************************************************/
 
+#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
@@ -401,10 +402,12 @@ dongle_t *irda_device_dongle_init(struct net_device *dev, int type)
 	}
 
 	/* Allocate dongle info for this instance */
-	dongle = kzalloc(sizeof(dongle_t), GFP_KERNEL);
+	dongle = kmalloc(sizeof(dongle_t), GFP_KERNEL);
 	if (!dongle)
 		goto out;
 
+	memset(dongle, 0, sizeof(dongle_t));
+
 	/* Bind the registration info to this particular instance */
 	dongle->issue = reg;
 	dongle->dev = dev;