summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-02 02:35:42 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-02 02:35:42 +0300
commit52ff5adc1f942008a790d6f964dec13793480c27 (patch)
treed45ebe69cee9706eaedf0f149d4050114c3aa021 /drivers/base
parent08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff)
parent20a875e2e86e73d13ec256781a7d55a7885868ec (diff)
downloadlinux-52ff5adc1f942008a790d6f964dec13793480c27.tar.xz
Merge branch 'device-properties'
* device-properties: serial: 8250_dw: Add quirk for APM X-Gene SoC ACPI / LPSS: Provide build-in properties of the UART ACPI / APD: Provide build-in properties of the UART driver core: Don't leak secondary fwnode on device removal
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 0a8bdade53f2..70c5be5b03a7 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1266,6 +1266,7 @@ void device_del(struct device *dev)
bus_remove_device(dev);
device_pm_remove(dev);
driver_deferred_probe_del(dev);
+ device_remove_properties(dev);
/* Notify the platform of the removal, in case they
* need to do anything...