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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
econet
/
af_econet.c
diff --git
a/net/econet/af_econet.c
b/net/econet/af_econet.c
index
8682656
..
4d66aac
100644
(file)
--- a/
net/econet/af_econet.c
+++ b/
net/econet/af_econet.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-674,12
+673,11
@@
static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
edev = dev->ec_ptr;
if (edev == NULL) {
/* Magic up a new one. */
edev = dev->ec_ptr;
if (edev == NULL) {
/* Magic up a new one. */
- edev = k
m
alloc(sizeof(struct ec_device), GFP_KERNEL);
+ edev = k
z
alloc(sizeof(struct ec_device), GFP_KERNEL);
if (edev == NULL) {
err = -ENOMEM;
break;
}
if (edev == NULL) {
err = -ENOMEM;
break;
}
- memset(edev, 0, sizeof(struct ec_device));
dev->ec_ptr = edev;
} else
net2dev_map[edev->net] = NULL;
dev->ec_ptr = edev;
} else
net2dev_map[edev->net] = NULL;