projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[cascardo/linux.git]
/
drivers
/
mfd
/
mfd-core.c
diff --git
a/drivers/mfd/mfd-core.c
b/drivers/mfd/mfd-core.c
index
4b4c1d4
..
3ac486a
100644
(file)
--- a/
drivers/mfd/mfd-core.c
+++ b/
drivers/mfd/mfd-core.c
@@
-193,8
+193,8
@@
static int mfd_add_device(struct device *parent, int id,
goto fail_alias;
}
- if (cell->p
set
) {
- ret = platform_device_add_properties(pdev, cell->p
set
);
+ if (cell->p
roperties
) {
+ ret = platform_device_add_properties(pdev, cell->p
roperties
);
if (ret)
goto fail_alias;
}