diff options
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 7ed4841327f2..d340b2f198c6 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
| @@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, | |||
| 2869 | 2869 | ||
| 2870 | len = le16_to_cpu(p->ext_param_page_length) * 16; | 2870 | len = le16_to_cpu(p->ext_param_page_length) * 16; |
| 2871 | ep = kmalloc(len, GFP_KERNEL); | 2871 | ep = kmalloc(len, GFP_KERNEL); |
| 2872 | if (!ep) { | 2872 | if (!ep) |
| 2873 | ret = -ENOMEM; | 2873 | return -ENOMEM; |
| 2874 | goto ext_out; | ||
| 2875 | } | ||
| 2876 | 2874 | ||
| 2877 | /* Send our own NAND_CMD_PARAM. */ | 2875 | /* Send our own NAND_CMD_PARAM. */ |
| 2878 | chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1); | 2876 | chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1); |
| @@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, | |||
| 2920 | } | 2918 | } |
| 2921 | 2919 | ||
| 2922 | pr_info("ONFI extended param page detected.\n"); | 2920 | pr_info("ONFI extended param page detected.\n"); |
| 2923 | return 0; | 2921 | ret = 0; |
| 2924 | 2922 | ||
| 2925 | ext_out: | 2923 | ext_out: |
| 2926 | kfree(ep); | 2924 | kfree(ep); |
