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
git-mirror · May 12, 2011 · 9bbd055 · 9bbd055
2 parents 411f05f + 9ddabb0
commit 9bbd055
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 }