linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / irda / irda_device.c

diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 7e7a317..e3debbd 100644 (file)
--- 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;