aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2015-06-01 17:10:49 -0400
committerBrian Norris <computersforpeace@gmail.com>2015-06-16 21:58:46 -0400
commit905cce7f4309f3ec19c1ed67edd68b7e67e88f3e (patch)
tree5c7ff2e829abe33071734fc078cb182f4b173001
parent5e65d48b6049e090fdc57490db9d797124f2a9eb (diff)
mtd: r852: Fix device_create_file() usage
device_create_file() can fail, therefore we have to handle this case and abort. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/mtd/nand/r852.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index baea83f4dea8..77e96d2df96c 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -653,11 +653,15 @@ static int r852_register_nand_device(struct r852_device *dev)
653 if (sm_register_device(dev->mtd, dev->sm)) 653 if (sm_register_device(dev->mtd, dev->sm))
654 goto error2; 654 goto error2;
655 655
656 if (device_create_file(&dev->mtd->dev, &dev_attr_media_type)) 656 if (device_create_file(&dev->mtd->dev, &dev_attr_media_type)) {
657 message("can't create media type sysfs attribute"); 657 message("can't create media type sysfs attribute");
658 goto error3;
659 }
658 660
659 dev->card_registred = 1; 661 dev->card_registred = 1;
660 return 0; 662 return 0;
663error3:
664 nand_release(dev->mtd);
661error2: 665error2:
662 kfree(dev->mtd); 666 kfree(dev->mtd);
663error1: 667error1: