aboutsummaryrefslogtreecommitdiffstats
path: root/net/econet/af_econet.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/econet/af_econet.c')
-rw-r--r--net/econet/af_econet.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 868265619dbb..4d66aac13483 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -9,7 +9,6 @@
9 * 9 *
10 */ 10 */
11 11
12#include <linux/config.h>
13#include <linux/module.h> 12#include <linux/module.h>
14 13
15#include <linux/types.h> 14#include <linux/types.h>
@@ -674,12 +673,11 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
674 edev = dev->ec_ptr; 673 edev = dev->ec_ptr;
675 if (edev == NULL) { 674 if (edev == NULL) {
676 /* Magic up a new one. */ 675 /* Magic up a new one. */
677 edev = kmalloc(sizeof(struct ec_device), GFP_KERNEL); 676 edev = kzalloc(sizeof(struct ec_device), GFP_KERNEL);
678 if (edev == NULL) { 677 if (edev == NULL) {
679 err = -ENOMEM; 678 err = -ENOMEM;
680 break; 679 break;
681 } 680 }
682 memset(edev, 0, sizeof(struct ec_device));
683 dev->ec_ptr = edev; 681 dev->ec_ptr = edev;
684 } else 682 } else
685 net2dev_map[edev->net] = NULL; 683 net2dev_map[edev->net] = NULL;