i2c: pnx: Fix crash due to wrong init of timer->data
authorWolfram Sang <w.sang@pengutronix.de>
Fri, 29 Apr 2011 13:30:02 +0000 (15:30 +0200)
committerBen Dooks <ben-linux@fluff.org>
Thu, 12 May 2011 23:10:36 +0000 (00:10 +0100)
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>
drivers/i2c/busses/i2c-pnx.c

index a97e3fec814826c8676f60743025f0ba6988ca0c..04be9f82e14bda8518c4d9562c680731e42c23b3 100644 (file)
@@ -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);
 }