diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:39:15 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:39:15 -0700 |
| commit | 6bb60d745d723659777f56e0871d40ee94d94773 (patch) | |
| tree | 0db925b25a18621f75b429ef81dee0cfc66a130f /drivers/i2c/busses | |
| parent | d333f20f36615711c33d50f47cf2ca097c678010 (diff) | |
| parent | 52f91d889a2c2a0f9e0b5e97fa7be8b584834016 (diff) | |
| download | kernel_samsung_tuna-6bb60d745d723659777f56e0871d40ee94d94773.zip kernel_samsung_tuna-6bb60d745d723659777f56e0871d40ee94d94773.tar.gz kernel_samsung_tuna-6bb60d745d723659777f56e0871d40ee94d94773.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/i2c/busses')
| -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 04be9f8..eb8ad53 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; } |