]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
e100: replace kmalloc with kcalloc
authorYan Burman <burman.yan@gmail.com>
Tue, 12 Dec 2006 19:03:10 +0000 (20:03 +0100)
committerAdrian Bunk <bunk@stusta.de>
Tue, 12 Dec 2006 19:03:10 +0000 (20:03 +0100)
Replace kmalloc+memset with kcalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Acked-By: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/net/e100.c

index 03bf164f9e8db32f3eb1fdafe1e3fffb0b3d26fb..c2ae2a24629b35bffd9d348866229a7a24b4e219 100644 (file)
@@ -1930,9 +1930,8 @@ static int e100_rx_alloc_list(struct nic *nic)
        nic->rx_to_use = nic->rx_to_clean = NULL;
        nic->ru_running = RU_UNINITIALIZED;
 
-       if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC)))
+       if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
                return -ENOMEM;
-       memset(nic->rxs, 0, sizeof(struct rx) * count);
 
        for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
                rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;