diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 16:55:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 16:55:33 -0700 |
| commit | 9bbd055808248a7adc78161472d3301285252361 (patch) | |
| tree | 9278fd9cddaea9e5932ce6478242927098f6aeb6 | |
| parent | vsprintf: Turn kptr_restrict off by default (diff) | |
| parent | i2c: pnx: Fix crash due to wrong init of timer->data (diff) | |
| download | linux-dev-9bbd055808248a7adc78161472d3301285252361.tar.xz linux-dev-9bbd055808248a7adc78161472d3301285252361.zip | |
Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux
* 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
i2c: pnx: Fix crash due to wrong init of timer->data
| -rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index a97e3fec8148..04be9f82e14b 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -65,7 +65,7 @@ static inline void i2c_pnx_arm_timer(struct i2c_pnx_algo_data *alg_data) jiffies, expires); timer->expires = jiffies + expires; - timer->data = (unsigned long)&alg_data; + timer->data = (unsigned long)alg_data; add_timer(timer); } |