openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2011-05-12 16:55:33 -07:00
parent 411f05f123 9ddabb055d
commit 9bbd055808
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/busses/i2c-pnx.c
View File

@ -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);
} }