diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-04-29 15:30:02 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-05-13 01:10:36 +0200 |
| commit | 9ddabb055d73c63037878bb9346e52c7f2e07e96 (patch) | |
| tree | 029448dcc4dbaabefe57dcf6b74bb467ee7b0405 /drivers/i2c/busses/i2c-pnx.c | |
| parent | Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwa... (diff) | |
| download | linux-9ddabb055d73c63037878bb9346e52c7f2e07e96.tar.xz linux-9ddabb055d73c63037878bb9346e52c7f2e07e96.zip | |
i2c: pnx: Fix crash due to wrong init of timer->data
alg_data is already a pointer which must be passed directly.
Reported-by: Dieter Ripp <ripp@systecnet.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ben Dooks <ben-i2c@fluff.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-pnx.c')
| -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); } |