On Tue, 4 Apr 2017 11:15:46 +0300
Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
> We accidentally return 1 on error instead of proper error codes.
>
Applied.
Thanks,
Boris
> Fixes: 07b23e3db9ed ("mtd: nand: Cleanup/rework the atmel_nand driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>
> diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
> index 27301603f394..b8d17a024dbd 100644
> --- a/drivers/mtd/nand/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/atmel/nand-controller.c
> @@ -1686,7 +1686,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;
> }
> @@ -1719,7 +1719,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;
> }
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
