projects
/
platform
/
kernel
/
linux-arm64.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[platform/kernel/linux-arm64.git]
/
drivers
/
i2c
/
busses
/
i2c-pnx.c
diff --git
a/drivers/i2c/busses/i2c-pnx.c
b/drivers/i2c/busses/i2c-pnx.c
index
a97e3fe
..
04be9f8
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);
}