[PATCH 3.2 065/102] can: at91_can: add missing prepare and unprepare of the clock
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: David Dueck 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 Signed-off-by: Anthony Harivel Acked-by: Boris Brezillon Signed-off-by: Marc Kleine-Budde Signed-off-by: Ben Hutchings --- drivers/net/can/at91_can.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) --- 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 * 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 * 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 at91_chip_stop(dev, CAN_STATE_STOPPED); free_irq(dev->irq, dev); - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); close_candev(dev); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.2 065/102] can: at91_can: add missing prepare and unprepare of the clock
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: David Dueck davidcdu...@googlemail.com 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 davidcdu...@googlemail.com Signed-off-by: Anthony Harivel anthony.hari...@emtrion.de Acked-by: Boris Brezillon boris.brezil...@free-electrons.com Signed-off-by: Marc Kleine-Budde m...@pengutronix.de Signed-off-by: Ben Hutchings b...@decadent.org.uk --- drivers/net/can/at91_can.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) --- 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 * 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 * 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 at91_chip_stop(dev, CAN_STATE_STOPPED); free_irq(dev-irq, dev); - clk_disable(priv-clk); + clk_disable_unprepare(priv-clk); close_candev(dev); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
