summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2013-10-27 23:42:12 +0100
committerBrian Norris <computersforpeace@gmail.com>2013-11-07 08:33:14 +0100
commit9650b9bec61d861b6b59d09eb389410b05d196e4 (patch)
treed53bcfc84c3b538cbf16f0500a2e57d90cb1a130 /drivers/mtd/devices
parentmtd: mxc_nand: Include linux/of.h header (diff)
downloadlinux-9650b9bec61d861b6b59d09eb389410b05d196e4.tar.xz
linux-9650b9bec61d861b6b59d09eb389410b05d196e4.zip
mtd: m25p80: fixup device removal failure path
Device removal should fail if MTD unregistration fails. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/m25p80.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 58978892c321..7eda71dbc183 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -1125,9 +1125,7 @@ static int m25p_remove(struct spi_device *spi)
struct m25p *flash = spi_get_drvdata(spi);
/* Clean up MTD stuff. */
- mtd_device_unregister(&flash->mtd);
-
- return 0;
+ return mtd_device_unregister(&flash->mtd);
}