Commit 9bbd0558 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 411f05f1 9ddabb05
...@@ -65,7 +65,7 @@ static inline void i2c_pnx_arm_timer(struct i2c_pnx_algo_data *alg_data) ...@@ -65,7 +65,7 @@ static inline void i2c_pnx_arm_timer(struct i2c_pnx_algo_data *alg_data)
jiffies, expires); jiffies, expires);
timer->expires = jiffies + expires; timer->expires = jiffies + expires;
timer->data = (unsigned long)&alg_data; timer->data = (unsigned long)alg_data;
add_timer(timer); add_timer(timer);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment