diff options
Diffstat (limited to 'drivers/nubus/nubus.c')
-rw-r--r-- | drivers/nubus/nubus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index 3a0a3a734933..e503c9c98032 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c | |||
@@ -466,9 +466,8 @@ static struct nubus_dev* __init | |||
466 | parent->base, dir.base); | 466 | parent->base, dir.base); |
467 | 467 | ||
468 | /* Actually we should probably panic if this fails */ | 468 | /* Actually we should probably panic if this fails */ |
469 | if ((dev = kmalloc(sizeof(*dev), GFP_ATOMIC)) == NULL) | 469 | if ((dev = kzalloc(sizeof(*dev), GFP_ATOMIC)) == NULL) |
470 | return NULL; | 470 | return NULL; |
471 | memset(dev, 0, sizeof(*dev)); | ||
472 | dev->resid = parent->type; | 471 | dev->resid = parent->type; |
473 | dev->directory = dir.base; | 472 | dev->directory = dir.base; |
474 | dev->board = board; | 473 | dev->board = board; |
@@ -800,9 +799,8 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes) | |||
800 | nubus_rewind(&rp, FORMAT_BLOCK_SIZE, bytelanes); | 799 | nubus_rewind(&rp, FORMAT_BLOCK_SIZE, bytelanes); |
801 | 800 | ||
802 | /* Actually we should probably panic if this fails */ | 801 | /* Actually we should probably panic if this fails */ |
803 | if ((board = kmalloc(sizeof(*board), GFP_ATOMIC)) == NULL) | 802 | if ((board = kzalloc(sizeof(*board), GFP_ATOMIC)) == NULL) |
804 | return NULL; | 803 | return NULL; |
805 | memset(board, 0, sizeof(*board)); | ||
806 | board->fblock = rp; | 804 | board->fblock = rp; |
807 | 805 | ||
808 | /* Dump the format block for debugging purposes */ | 806 | /* Dump the format block for debugging purposes */ |