diff options
Diffstat (limited to 'arch/ppc/platforms/katana.c')
-rw-r--r-- | arch/ppc/platforms/katana.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index 6e58e30ceed1..ad21280e8920 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/ppc/platforms/katana.c | ||
3 | * | ||
4 | * Board setup routines for the Artesyn Katana cPCI boards. | 2 | * Board setup routines for the Artesyn Katana cPCI boards. |
5 | * | 3 | * |
6 | * Author: Tim Montgomery <timm@artesyncp.com> | 4 | * Author: Tim Montgomery <timm@artesyncp.com> |
@@ -598,7 +596,7 @@ katana_fixup_mv64xxx_pdata(struct platform_device *pdev) | |||
598 | } | 596 | } |
599 | #endif | 597 | #endif |
600 | 598 | ||
601 | static int __init | 599 | static int |
602 | katana_platform_notify(struct device *dev) | 600 | katana_platform_notify(struct device *dev) |
603 | { | 601 | { |
604 | static struct { | 602 | static struct { |
@@ -664,12 +662,11 @@ katana_setup_mtd(void) | |||
664 | 662 | ||
665 | ptbl_entries = (size >= (64*MB)) ? 6 : 4; | 663 | ptbl_entries = (size >= (64*MB)) ? 6 : 4; |
666 | 664 | ||
667 | if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition), | 665 | if ((ptbl = kcalloc(ptbl_entries, sizeof(struct mtd_partition), |
668 | GFP_KERNEL)) == NULL) { | 666 | GFP_KERNEL)) == NULL) { |
669 | printk(KERN_WARNING "Can't alloc MTD partition table\n"); | 667 | printk(KERN_WARNING "Can't alloc MTD partition table\n"); |
670 | return -ENOMEM; | 668 | return -ENOMEM; |
671 | } | 669 | } |
672 | memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition)); | ||
673 | 670 | ||
674 | ptbl[0].name = "Monitor"; | 671 | ptbl[0].name = "Monitor"; |
675 | ptbl[0].size = KATANA_MTD_MONITOR_SIZE; | 672 | ptbl[0].size = KATANA_MTD_MONITOR_SIZE; |