diff options
-rw-r--r-- | drivers/mtd/nand/s3c2410.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index dc02dcd0c08f..239aadfd01b0 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -929,14 +929,13 @@ static int s3c24xx_nand_probe(struct platform_device *pdev) | |||
929 | 929 | ||
930 | pr_debug("s3c2410_nand_probe(%p)\n", pdev); | 930 | pr_debug("s3c2410_nand_probe(%p)\n", pdev); |
931 | 931 | ||
932 | info = kmalloc(sizeof(*info), GFP_KERNEL); | 932 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
933 | if (info == NULL) { | 933 | if (info == NULL) { |
934 | dev_err(&pdev->dev, "no memory for flash info\n"); | 934 | dev_err(&pdev->dev, "no memory for flash info\n"); |
935 | err = -ENOMEM; | 935 | err = -ENOMEM; |
936 | goto exit_error; | 936 | goto exit_error; |
937 | } | 937 | } |
938 | 938 | ||
939 | memset(info, 0, sizeof(*info)); | ||
940 | platform_set_drvdata(pdev, info); | 939 | platform_set_drvdata(pdev, info); |
941 | 940 | ||
942 | spin_lock_init(&info->controller.lock); | 941 | spin_lock_init(&info->controller.lock); |
@@ -994,15 +993,13 @@ static int s3c24xx_nand_probe(struct platform_device *pdev) | |||
994 | /* allocate our information */ | 993 | /* allocate our information */ |
995 | 994 | ||
996 | size = nr_sets * sizeof(*info->mtds); | 995 | size = nr_sets * sizeof(*info->mtds); |
997 | info->mtds = kmalloc(size, GFP_KERNEL); | 996 | info->mtds = kzalloc(size, GFP_KERNEL); |
998 | if (info->mtds == NULL) { | 997 | if (info->mtds == NULL) { |
999 | dev_err(&pdev->dev, "failed to allocate mtd storage\n"); | 998 | dev_err(&pdev->dev, "failed to allocate mtd storage\n"); |
1000 | err = -ENOMEM; | 999 | err = -ENOMEM; |
1001 | goto exit_error; | 1000 | goto exit_error; |
1002 | } | 1001 | } |
1003 | 1002 | ||
1004 | memset(info->mtds, 0, size); | ||
1005 | |||
1006 | /* initialise all possible chips */ | 1003 | /* initialise all possible chips */ |
1007 | 1004 | ||
1008 | nmtd = info->mtds; | 1005 | nmtd = info->mtds; |