diff options
author | Joe Jin <joe.jin@oracle.com> | 2007-02-05 21:08:47 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:38:55 -0500 |
commit | 919afbd68863550665b328a78107bc2919c5e3f4 (patch) | |
tree | f5790141add34749592249db1db8b26f6f2a2e74 | |
parent | 97353cb4c05c2edf260e9d1b19a29d3cc0060a09 (diff) |
[NET] slip: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls
This patch replace kmalloc() + memset() pairs with the appropriate
kzalloc().
Signed-off-by: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/slip.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index a0806d262fc6..2f4b1de7a2b4 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
@@ -1343,15 +1343,12 @@ static int __init slip_init(void) | |||
1343 | printk(KERN_INFO "SLIP linefill/keepalive option.\n"); | 1343 | printk(KERN_INFO "SLIP linefill/keepalive option.\n"); |
1344 | #endif | 1344 | #endif |
1345 | 1345 | ||
1346 | slip_devs = kmalloc(sizeof(struct net_device *)*slip_maxdev, GFP_KERNEL); | 1346 | slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev, GFP_KERNEL); |
1347 | if (!slip_devs) { | 1347 | if (!slip_devs) { |
1348 | printk(KERN_ERR "SLIP: Can't allocate slip devices array! Uaargh! (-> No SLIP available)\n"); | 1348 | printk(KERN_ERR "SLIP: Can't allocate slip devices array! Uaargh! (-> No SLIP available)\n"); |
1349 | return -ENOMEM; | 1349 | return -ENOMEM; |
1350 | } | 1350 | } |
1351 | 1351 | ||
1352 | /* Clear the pointer array, we allocate devices when we need them */ | ||
1353 | memset(slip_devs, 0, sizeof(struct net_device *)*slip_maxdev); | ||
1354 | |||
1355 | /* Fill in our line protocol discipline, and register it */ | 1352 | /* Fill in our line protocol discipline, and register it */ |
1356 | if ((status = tty_register_ldisc(N_SLIP, &sl_ldisc)) != 0) { | 1353 | if ((status = tty_register_ldisc(N_SLIP, &sl_ldisc)) != 0) { |
1357 | printk(KERN_ERR "SLIP: can't register line discipline (err = %d)\n", status); | 1354 | printk(KERN_ERR "SLIP: can't register line discipline (err = %d)\n", status); |