From: Dan Carpenter Date: Tue, 4 Apr 2017 08:15:46 +0000 (+0300) Subject: mtd: nand: Fix a couple error codes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=70106ddaf31150a57dc00b3d7d5167f693b521ef;p=openwrt%2Fstaging%2Fblogic.git mtd: nand: Fix a couple error codes We accidentally return 1 on error instead of proper error codes. Fixes: 07b23e3db9ed ("mtd: nand: Cleanup/rework the atmel_nand driver") Signed-off-by: Dan Carpenter Signed-off-by: Boris Brezillon --- diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c index 80e2459f92f8..c11f358c6df6 100644 --- a/drivers/mtd/nand/atmel/nand-controller.c +++ b/drivers/mtd/nand/atmel/nand-controller.c @@ -1685,7 +1685,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc, nc->smc = syscon_node_to_regmap(np); of_node_put(np); if (IS_ERR(nc->smc)) { - ret = IS_ERR(nc->smc); + ret = PTR_ERR(nc->smc); dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret); return ret; } @@ -1718,7 +1718,7 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc) nc->matrix = syscon_node_to_regmap(np); of_node_put(np); if (IS_ERR(nc->matrix)) { - ret = IS_ERR(nc->matrix); + ret = PTR_ERR(nc->matrix); dev_err(dev, "Could not get Matrix regmap (err = %d)\n", ret); return ret; }