summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-04-04 10:34:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 08:56:39 -0700
commitb476e58a834f099aa0f7b4d0a71853e6c61ee6d8 (patch)
tree37c3100a85f0766d05068b52084d5e6e889d7c72
parent9051b1e1aed62944eb634c3a85fad76353e5fa05 (diff)
downloadlinux-stable-b476e58a834f099aa0f7b4d0a71853e6c61ee6d8.tar.gz
linux-stable-b476e58a834f099aa0f7b4d0a71853e6c61ee6d8.tar.bz2
linux-stable-b476e58a834f099aa0f7b4d0a71853e6c61ee6d8.zip
i2c: pnx: Disable clk in suspend
commit 6c557cfee08751d22aed34840f389b846f0f4508 upstream. In the driver's suspend function, clk_enable() was used instead of clk_disable(). This is corrected with this patch. Signed-off-by: Roland Stigge <stigge@antcom.de> Reviewed-by: Arnd Bergmann <arnd@arndb.de> [wsa: reworded commit header slightly] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/i2c/busses/i2c-pnx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 04be9f82e14b..eb8ad538c79f 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -546,8 +546,7 @@ static int i2c_pnx_controller_suspend(struct platform_device *pdev,
{
struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
- /* FIXME: shouldn't this be clk_disable? */
- clk_enable(alg_data->clk);
+ clk_disable(alg_data->clk);
return 0;
}