projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
regulator
/
tps51632-regulator.c
diff --git
a/drivers/regulator/tps51632-regulator.c
b/drivers/regulator/tps51632-regulator.c
index
6e67be7
..
9392a7c
100644
(file)
--- a/
drivers/regulator/tps51632-regulator.c
+++ b/
drivers/regulator/tps51632-regulator.c
@@
-275,7
+275,7
@@
static int tps51632_probe(struct i2c_client *client,
}
}
- pdata =
client->dev.platform_data
;
+ pdata =
dev_get_platdata(&client->dev)
;
if (!pdata && client->dev.of_node)
pdata = of_get_tps51632_platform_data(&client->dev);
if (!pdata) {