projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca1376d
)
i2c: pnx: Fix crash due to wrong init of timer->data
author
Wolfram Sang
<
[email protected]
>
Fri, 29 Apr 2011 13:30:02 +0000
(15:30 +0200)
committer
Ben Dooks
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: Wolfram Sang <
[email protected]
>
Cc: Russell King <
[email protected]
>
Cc: Ben Dooks <
[email protected]
>
Signed-off-by: Ben Dooks <
[email protected]
>
drivers/i2c/busses/i2c-pnx.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-pnx.c
b/drivers/i2c/busses/i2c-pnx.c
index a97e3fec814826c8676f60743025f0ba6988ca0c..04be9f82e14bda8518c4d9562c680731e42c23b3 100644
(file)
--- 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);
}