diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-04-04 04:15:46 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-04-25 08:18:39 -0400 |
commit | 70106ddaf31150a57dc00b3d7d5167f693b521ef (patch) | |
tree | 82a3e3ae0097c6fb61ad032c84ea084716f02a41 | |
parent | 477544c62a84d3bacd9f90ba75ffc16c04d78071 (diff) |
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 <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r-- | drivers/mtd/nand/atmel/nand-controller.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
1685 | nc->smc = syscon_node_to_regmap(np); | 1685 | nc->smc = syscon_node_to_regmap(np); |
1686 | of_node_put(np); | 1686 | of_node_put(np); |
1687 | if (IS_ERR(nc->smc)) { | 1687 | if (IS_ERR(nc->smc)) { |
1688 | ret = IS_ERR(nc->smc); | 1688 | ret = PTR_ERR(nc->smc); |
1689 | dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret); | 1689 | dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret); |
1690 | return ret; | 1690 | return ret; |
1691 | } | 1691 | } |
@@ -1718,7 +1718,7 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc) | |||
1718 | nc->matrix = syscon_node_to_regmap(np); | 1718 | nc->matrix = syscon_node_to_regmap(np); |
1719 | of_node_put(np); | 1719 | of_node_put(np); |
1720 | if (IS_ERR(nc->matrix)) { | 1720 | if (IS_ERR(nc->matrix)) { |
1721 | ret = IS_ERR(nc->matrix); | 1721 | ret = PTR_ERR(nc->matrix); |
1722 | dev_err(dev, "Could not get Matrix regmap (err = %d)\n", ret); | 1722 | dev_err(dev, "Could not get Matrix regmap (err = %d)\n", ret); |
1723 | return ret; | 1723 | return ret; |
1724 | } | 1724 | } |