diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-25 13:09:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-25 13:10:00 +0200 |
| commit | 7de5d895b2020260190db0021de646f3f22f755e (patch) | |
| tree | 51d012f0b76a2ec1bd3b4837690faf1087f37056 /drivers/platform/x86/intel_scu_ipc.c | |
| parent | 04fba67163a9e6132614b72b33bb2743bd33ffb3 (diff) | |
| parent | 502adf5778f4151dcba3f64dd6ed322151f3712c (diff) | |
| download | linux-7de5d895b2020260190db0021de646f3f22f755e.tar.bz2 | |
Merge branch 'linus' into perf/core
Merge reason: pick up perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/platform/x86/intel_scu_ipc.c')
| -rw-r--r-- | drivers/platform/x86/intel_scu_ipc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 943f9084dcb1..6abe18e638e9 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -487,7 +487,7 @@ int intel_scu_ipc_i2c_cntrl(u32 addr, u32 *data) mdelay(1); *data = readl(ipcdev.i2c_base + I2C_DATA_ADDR); } else if (cmd == IPC_I2C_WRITE) { - writel(addr, ipcdev.i2c_base + I2C_DATA_ADDR); + writel(*data, ipcdev.i2c_base + I2C_DATA_ADDR); mdelay(1); writel(addr, ipcdev.i2c_base + IPC_I2C_CNTRL_ADDR); } else { |