git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
irda
/
irda_device.c
diff --git
a/net/irda/irda_device.c
b/net/irda/irda_device.c
index
e3debbd
..
7e7a317
100644
(file)
--- a/
net/irda/irda_device.c
+++ b/
net/irda/irda_device.c
@@
-29,7
+29,6
@@
*
********************************************************************/
*
********************************************************************/
-#include <linux/config.h>
#include <linux/string.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
#include <linux/string.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
@@
-402,12
+401,10
@@
dongle_t *irda_device_dongle_init(struct net_device *dev, int type)
}
/* Allocate dongle info for this instance */
}
/* Allocate dongle info for this instance */
- dongle = k
m
alloc(sizeof(dongle_t), GFP_KERNEL);
+ dongle = k
z
alloc(sizeof(dongle_t), GFP_KERNEL);
if (!dongle)
goto out;
if (!dongle)
goto out;
- memset(dongle, 0, sizeof(dongle_t));
-
/* Bind the registration info to this particular instance */
dongle->issue = reg;
dongle->dev = dev;
/* Bind the registration info to this particular instance */
dongle->issue = reg;
dongle->dev = dev;