diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-01 19:35:42 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-01 19:35:42 -0400 |
| commit | 52ff5adc1f942008a790d6f964dec13793480c27 (patch) | |
| tree | d45ebe69cee9706eaedf0f149d4050114c3aa021 /drivers/base | |
| parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
| parent | 20a875e2e86e73d13ec256781a7d55a7885868ec (diff) | |
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.c | 1 |
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) | |||
| 1266 | bus_remove_device(dev); | 1266 | bus_remove_device(dev); |
| 1267 | device_pm_remove(dev); | 1267 | device_pm_remove(dev); |
| 1268 | driver_deferred_probe_del(dev); | 1268 | driver_deferred_probe_del(dev); |
| 1269 | device_remove_properties(dev); | ||
| 1269 | 1270 | ||
| 1270 | /* Notify the platform of the removal, in case they | 1271 | /* Notify the platform of the removal, in case they |
| 1271 | * need to do anything... | 1272 | * need to do anything... |