diff options
| author | David Dueck <davidcdueck@googlemail.com> | 2014-09-17 14:26:48 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-11-05 20:27:45 +0000 |
| commit | 51562cd4de104521223f8e4e9cbe04bef401a79f (patch) | |
| tree | 048b5bea6306a32490c496ea9e49b183cc06cf03 /drivers/net | |
| parent | 3158bdb265224ef34e7248fd802df13e36b5f3c3 (diff) | |
| download | kernel_samsung_smdk4412-51562cd4de104521223f8e4e9cbe04bef401a79f.zip kernel_samsung_smdk4412-51562cd4de104521223f8e4e9cbe04bef401a79f.tar.gz kernel_samsung_smdk4412-51562cd4de104521223f8e4e9cbe04bef401a79f.tar.bz2 | |
can: at91_can: add missing prepare and unprepare of the clock
commit e77980e50bc2850599d4d9c0192b67a9ffd6daac 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: David Dueck <davidcdueck@googlemail.com>
Signed-off-by: Anthony Harivel <anthony.harivel@emtrion.de>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/at91_can.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 044ea06..ab411c3 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c @@ -1115,7 +1115,9 @@ static int at91_open(struct net_device *dev) struct at91_priv *priv = netdev_priv(dev); int err; - clk_enable(priv->clk); + err = clk_prepare_enable(priv->clk); + if (err) + return err; /* check or determine and set bittime */ err = open_candev(dev); @@ -1139,7 +1141,7 @@ static int at91_open(struct net_device *dev) out_close: close_candev(dev); out: - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); return err; } @@ -1156,7 +1158,7 @@ static int at91_close(struct net_device *dev) at91_chip_stop(dev, CAN_STATE_STOPPED); free_irq(dev->irq, dev); - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); close_candev(dev); |