Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1cb556c authored by Michał Mirosław's avatar Michał Mirosław Committed by David Woodhouse
Browse files

mtd: gpmi-nand: fix error return from gpmi_get_clks() 



Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent cf3b55a9

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+8 −4
Original line number Diff line number Diff line
@@ -473,12 +473,14 @@ static int gpmi_get_clks(struct gpmi_nand_data *this) 
	struct resources *r = &this->resources;

	char **extra_clks = NULL;

	struct clk *clk;

	int i;

	int err, i;



	/* The main clock is stored in the first. */

	r->clock[0] = clk_get(this->dev, "gpmi_io");

	if (IS_ERR(r->clock[0]))

	if (IS_ERR(r->clock[0])) {

		err = PTR_ERR(r->clock[0]);

		goto err_clock;

	}



	/* Get extra clocks */

	if (GPMI_IS_MX6Q(this))
@@ -491,8 +493,10 @@ static int gpmi_get_clks(struct gpmi_nand_data *this) 
			break;



		clk = clk_get(this->dev, extra_clks[i - 1]);

		if (IS_ERR(clk))

		if (IS_ERR(clk)) {

			err = PTR_ERR(clk);

			goto err_clock;

		}



		r->clock[i] = clk;

	}
@@ -511,7 +515,7 @@ static int gpmi_get_clks(struct gpmi_nand_data *this) 
err_clock:

	dev_dbg(this->dev, "failed in finding the clocks.\n");

	gpmi_put_clks(this);

	return -ENOMEM;

	return err;

}



static int acquire_resources(struct gpmi_nand_data *this)