diff options
author | Stefan Roese <sr@denx.de> | 2015-10-02 12:40:21 +0200 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-10-02 11:08:17 -0700 |
commit | 6efadcf9592c2ed438d1692ca55168e3de5c975b (patch) | |
tree | 154f218590d2c71b285fa7316f25be32d460d39b /drivers/mtd/nand | |
parent | cbf29b83caa8c336cdb80b44bd1b959372e24d28 (diff) | |
download | linux-6efadcf9592c2ed438d1692ca55168e3de5c975b.tar.bz2 |
mtd: nand: fsmc: Remove BUG macros
Remove the BUG macros and return with error (if possible) instead.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/fsmc_nand.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index dc9488261690..45948e8f5fb0 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -348,7 +348,7 @@ static void fsmc_select_chip(struct mtd_info *mtd, int chipnr) break; default: - BUG(); + dev_err(host->dev, "unsupported chip-select %d\n", chipnr); } } @@ -1111,7 +1111,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) default: dev_warn(&pdev->dev, "No oob scheme defined for oobsize %d\n", mtd->oobsize); - BUG(); + ret = -EINVAL; + goto err_probe; } } else { switch (host->mtd.oobsize) { @@ -1127,7 +1128,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) default: dev_warn(&pdev->dev, "No oob scheme defined for oobsize %d\n", mtd->oobsize); - BUG(); + ret = -EINVAL; + goto err_probe; } } |