projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
max8998.c
diff --git
a/drivers/mfd/max8998.c
b/drivers/mfd/max8998.c
index f47eaa70eae076f172f4e72977f98dfe26e680da..612ca404e1502d6c736eaf239d9b721e522664f9 100644
(file)
--- a/
drivers/mfd/max8998.c
+++ b/
drivers/mfd/max8998.c
@@
-175,7
+175,7
@@
static inline int max8998_i2c_get_driver_data(struct i2c_client *i2c,
if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(max8998_dt_match, i2c->dev.of_node);
- return (int)match->data;
+ return (int)
(long)
match->data;
}
return (int)id->driver_data;