linux

* 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c: pnx: Fix crash due to wrong init of timer->data

drivers/i2c/busses/i2c-pnx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}