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 tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
mfd-core.c
diff --git
a/drivers/mfd/mfd-core.c
b/drivers/mfd/mfd-core.c
index 32e8d47d900284574aefaf9909643c3c372afc94..2676492447378e989b019d05e223b622afb2c79c 100644
(file)
--- a/
drivers/mfd/mfd-core.c
+++ b/
drivers/mfd/mfd-core.c
@@
-117,8
+117,6
@@
static int mfd_add_device(struct device *parent, int id,
}
}
}
- if (!pdev->dev.of_node)
- pdev->dev.of_node = parent->of_node;
if (cell->pdata_size) {
ret = platform_device_add_data(pdev,