diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:40:36 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:40:36 -0700 |
| commit | 6f3a6cfb771988e26a2c8fb018b15f868b3e5767 (patch) | |
| tree | 444260b7d6287f08123cb2c1b3fe2dc2e2bd4a73 /drivers/i2c | |
| parent | 79fe25e9fd33b44e6e7fa7de1e169a3fc9b47c5b (diff) | |
| parent | 1f41ac974d4c03cf16b1f6b8ffee817ab524d587 (diff) | |
| download | kernel_samsung_tuna-6f3a6cfb771988e26a2c8fb018b15f868b3e5767.tar.gz kernel_samsung_tuna-6f3a6cfb771988e26a2c8fb018b15f868b3e5767.tar.bz2 kernel_samsung_tuna-6f3a6cfb771988e26a2c8fb018b15f868b3e5767.zip | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 04be9f82e14..eb8ad538c79 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; } |