On Wed, Aug 07, 2013 at 09:28 +0200, Marc Kleine-Budde wrote:
>
> On 08/06/2013 10:43 PM, Gerhard Sittig wrote:
> > [ ... ]
> > diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
> > index e6b4095..4f998f5 100644
> > --- a/drivers/net/can/mscan/mscan.c
> > +++ b/drivers/net/can/mscan/mscan.c
> > @@ -573,10 +573,24 @@ static int mscan_open(struct net_device *dev)
> > struct mscan_priv *priv = netdev_priv(dev);
> > struct mscan_regs __iomem *regs = priv->reg_base;
> >
> > + if (priv->clk_ipg) {
> > + ret = clk_prepare_enable(priv->clk_ipg);
> > + if (ret)
> > + goto exit_retcode;
> > + }
> > + if (priv->clk_can) {
> > + ret = clk_prepare_enable(priv->clk_can);
> > + if (ret) {
> > + if (priv->clk_ipg)
> > + clk_disable_unprepare(priv->clk_ipg);
> > + goto exit_retcode;
>
> Why don't you add another jump label and jump to that to disable the
> ipkg clock?
You are right. I've queued this change for v5 (adding a label in
the existing error path, jumping to it instead of explicitly
disabling the clock).
>
> > + }
> > + }
> > +
> > /* common open */
> > ret = open_candev(dev);
> > if (ret)
> > - return ret;
> > + goto exit_dis_clock;
> >
> > napi_enable(&priv->napi);
> >
> > @@ -604,6 +618,12 @@ exit_free_irq:
> > exit_napi_disable:
> > napi_disable(&priv->napi);
> > close_candev(dev);
> > +exit_dis_clock:
> > + if (priv->clk_can)
> > + clk_disable_unprepare(priv->clk_can);
> > + if (priv->clk_ipg)
> > + clk_disable_unprepare(priv->clk_ipg);
> > +exit_retcode:
> > return ret;
> > }
>
> Marc
Thank you for reviewing several versions of the patch!
virtually yours
Gerhard Sittig
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@xxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
