summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-12-18 11:39:53 -0800
committerBrian Norris <computersforpeace@gmail.com>2015-12-18 12:43:00 -0800
commit2d3743944a6b425f3a3795a967499c13e0d8856c (patch)
tree7b028423ad609469780a881de8dc7b85617390d7 /drivers/mtd
parent7208b997b726522cdbea61f53a82c763704c015a (diff)
downloadlinux-stable-2d3743944a6b425f3a3795a967499c13e0d8856c.tar.gz
linux-stable-2d3743944a6b425f3a3795a967499c13e0d8856c.tar.bz2
linux-stable-2d3743944a6b425f3a3795a967499c13e0d8856c.zip
mtd: nand: docg4: simplify error case
Other refactorings have left the 'fail' label much simpler, so it shouldn't have to handle the failed allocation case. This also fixes a -Wshadow warning. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/docg4.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index cb6efadd712e..24d478d90dcc 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -1353,14 +1353,10 @@ static int __init probe_docg4(struct platform_device *pdev)
doc->mtd = mtd;
return 0;
- fail:
- if (nand) {
- /* re-declarations avoid compiler warning */
- struct docg4_priv *doc = nand->priv;
- nand_release(mtd); /* deletes partitions and mtd devices */
- free_bch(doc->bch);
- kfree(nand);
- }
+fail:
+ nand_release(mtd); /* deletes partitions and mtd devices */
+ free_bch(doc->bch);
+ kfree(nand);
fail_unmap:
iounmap(virtadr);