Commit 51562cd4 authored by David Dueck's avatar David Dueck Committed by Ben Hutchings

can: at91_can: add missing prepare and unprepare of the clock

commit e77980e5 upstream.

In order to make the driver work with the common clock framework, this patch
converts the clk_enable()/clk_disable() to
clk_prepare_enable()/clk_disable_unprepare(). While there, add the missing
error handling.
Signed-off-by: default avatarDavid Dueck <davidcdueck@googlemail.com>
Signed-off-by: default avatarAnthony Harivel <anthony.harivel@emtrion.de>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 3158bdb2
...@@ -1115,7 +1115,9 @@ static int at91_open(struct net_device *dev) ...@@ -1115,7 +1115,9 @@ static int at91_open(struct net_device *dev)
struct at91_priv *priv = netdev_priv(dev); struct at91_priv *priv = netdev_priv(dev);
int err; int err;
clk_enable(priv->clk); err = clk_prepare_enable(priv->clk);
if (err)
return err;
/* check or determine and set bittime */ /* check or determine and set bittime */
err = open_candev(dev); err = open_candev(dev);
...@@ -1139,7 +1141,7 @@ static int at91_open(struct net_device *dev) ...@@ -1139,7 +1141,7 @@ static int at91_open(struct net_device *dev)
out_close: out_close:
close_candev(dev); close_candev(dev);
out: out:
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
return err; return err;
} }
...@@ -1156,7 +1158,7 @@ static int at91_close(struct net_device *dev) ...@@ -1156,7 +1158,7 @@ static int at91_close(struct net_device *dev)
at91_chip_stop(dev, CAN_STATE_STOPPED); at91_chip_stop(dev, CAN_STATE_STOPPED);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
close_candev(dev); close_candev(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment