diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-12-08 05:39:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:01 -0500 |
commit | 41f96935b4c41daea2c4dbbf137960375cf764c1 (patch) | |
tree | 9af3af5e41f68baf063b5f929797c837169bb9df /drivers/isdn/hysdn/hysdn_boot.c | |
parent | 0b2dd130a5a8774a30de1f94266f6b9a9892153c (diff) |
[PATCH] isdn: replace kmalloc+memset with kzalloc
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hysdn/hysdn_boot.c')
-rw-r--r-- | drivers/isdn/hysdn/hysdn_boot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c index 6d0eb0f42fca..be787e16bb79 100644 --- a/drivers/isdn/hysdn/hysdn_boot.c +++ b/drivers/isdn/hysdn/hysdn_boot.c | |||
@@ -278,14 +278,13 @@ pof_write_open(hysdn_card * card, unsigned char **bufp) | |||
278 | return (-ERR_ALREADY_BOOT); /* boot already active */ | 278 | return (-ERR_ALREADY_BOOT); /* boot already active */ |
279 | } | 279 | } |
280 | /* error no mem available */ | 280 | /* error no mem available */ |
281 | if (!(boot = kmalloc(sizeof(struct boot_data), GFP_KERNEL))) { | 281 | if (!(boot = kzalloc(sizeof(struct boot_data), GFP_KERNEL))) { |
282 | if (card->debug_flags & LOG_MEM_ERR) | 282 | if (card->debug_flags & LOG_MEM_ERR) |
283 | hysdn_addlog(card, "POF open: unable to allocate mem"); | 283 | hysdn_addlog(card, "POF open: unable to allocate mem"); |
284 | return (-EFAULT); | 284 | return (-EFAULT); |
285 | } | 285 | } |
286 | card->boot = boot; | 286 | card->boot = boot; |
287 | card->state = CARD_STATE_BOOTING; | 287 | card->state = CARD_STATE_BOOTING; |
288 | memset(boot, 0, sizeof(struct boot_data)); | ||
289 | 288 | ||
290 | card->stopcard(card); /* first stop the card */ | 289 | card->stopcard(card); /* first stop the card */ |
291 | if (card->testram(card)) { | 290 | if (card->testram(card)) { |