* [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks()
@ 2013-05-04 13:19 Michał Mirosław
2013-05-06 8:20 ` Huang Shijie
2013-07-01 5:15 ` Artem Bityutskiy
0 siblings, 2 replies; 3+ messages in thread
From: Michał Mirosław @ 2013-05-04 13:19 UTC (permalink / raw)
To: linux-mtd; +Cc: Huang Shijie, Shawn Guo, David Woodhouse, Bill Pemberton
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 25ecfa1..1d18efc 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks()
2013-05-04 13:19 [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks() Michał Mirosław
@ 2013-05-06 8:20 ` Huang Shijie
2013-07-01 5:15 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Huang Shijie @ 2013-05-06 8:20 UTC (permalink / raw)
To: Michał Mirosław
Cc: David Woodhouse, Shawn Guo, linux-mtd, Bill Pemberton
于 2013年05月04日 21:19, Michał Mirosław 写道:
> Signed-off-by: Michał Mirosław<mirq-linux@rere.qmqm.pl>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 25ecfa1..1d18efc 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -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)
Acked-by: Huang Shijie <b32955@freescale.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks()
2013-05-04 13:19 [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks() Michał Mirosław
2013-05-06 8:20 ` Huang Shijie
@ 2013-07-01 5:15 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Artem Bityutskiy @ 2013-07-01 5:15 UTC (permalink / raw)
To: Michał Mirosław
Cc: Huang Shijie, Shawn Guo, linux-mtd, David Woodhouse, Bill Pemberton
On Sat, 2013-05-04 at 15:19 +0200, Michał Mirosław wrote:
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Pushed to l2-mtd.git, thanks!
--
Best Regards,
Artem Bityutskiy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-01 5:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-04 13:19 [PATCH] mxs/gpmi-nand: fix error return from gpmi_get_clks() Michał Mirosław
2013-05-06 8:20 ` Huang Shijie
2013-07-01 5:15 ` Artem Bityutskiy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.