git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
wm8994-core.c
diff --git
a/drivers/mfd/wm8994-core.c
b/drivers/mfd/wm8994-core.c
index 1e4f1694f065721b43dbb09fc3f577e54c9c91df..aba7af6881751a48e5a59559164bed2f8f46b517 100644
(file)
--- a/
drivers/mfd/wm8994-core.c
+++ b/
drivers/mfd/wm8994-core.c
@@
-628,7
+628,7
@@
static int wm8994_i2c_probe(struct i2c_client *i2c)
if (i2c->dev.of_node) {
of_id = of_match_device(wm8994_of_match, &i2c->dev);
if (of_id)
- wm8994->type = (
enum wm8994_type
)of_id->data;
+ wm8994->type = (
uintptr_t
)of_id->data;
} else {
wm8994->type = id->driver_data;
}