diff options
author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2007-10-17 02:26:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:50 -0400 |
commit | 978550b828d1c29dfd65707f5d001053c3d2d610 (patch) | |
tree | 0a4bf0ee355796a250da395974326e474b4e1158 | |
parent | b63d50c438bd3a8910263e15c37ca8634b110c92 (diff) |
drivers/char/ip2/ip2main.c: kmalloc + memset conversion to kzalloc
drivers/char/ip2/ip2main.c | 104398 -> 104346 (-52 bytes)
drivers/char/ip2/ip2main.o | 210710 -> 210702 (-8 bytes)
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/ip2/ip2main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index bd94d5f9e62b..3300ba3c8588 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -646,10 +646,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) | |||
646 | 646 | ||
647 | for ( i = 0; i < IP2_MAX_BOARDS; ++i ) { | 647 | for ( i = 0; i < IP2_MAX_BOARDS; ++i ) { |
648 | if ( ip2config.addr[i] ) { | 648 | if ( ip2config.addr[i] ) { |
649 | pB = kmalloc( sizeof(i2eBordStr), GFP_KERNEL); | 649 | pB = kzalloc(sizeof(i2eBordStr), GFP_KERNEL); |
650 | if ( pB != NULL ) { | 650 | if (pB) { |
651 | i2BoardPtrTable[i] = pB; | 651 | i2BoardPtrTable[i] = pB; |
652 | memset( pB, 0, sizeof(i2eBordStr) ); | ||
653 | iiSetAddress( pB, ip2config.addr[i], ii2DelayTimer ); | 652 | iiSetAddress( pB, ip2config.addr[i], ii2DelayTimer ); |
654 | iiReset( pB ); | 653 | iiReset( pB ); |
655 | } else { | 654 | } else { |