diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-03 21:48:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-03 21:48:49 -0500 |
| commit | 1efb9796f80e1394f080be1b4f3173ff108ad1f2 (patch) | |
| tree | 178d15612a53330d74f2be235df2e0252562edd3 /drivers/core/device-remove.c | |
| parent | 8aad16916d04e3db0d1652cb96e840e209e19252 (diff) | |
| parent | 9aa886cc0b4424b49b24486f804fd18aafad00b2 (diff) | |
Merge tag 'dm-pull-3mar20' of git://git.denx.de/u-boot-dm
Fixes for power domain on device removal
Diffstat (limited to 'drivers/core/device-remove.c')
| -rw-r--r-- | drivers/core/device-remove.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 444e34b4921..ff5b28cb6a7 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -194,8 +194,9 @@ int device_remove(struct udevice *dev, uint flags) } } - if (!(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF) && - (dev != gd->cur_serial_dev)) + if (!(drv->flags & + (DM_FLAG_DEFAULT_PD_CTRL_OFF | DM_FLAG_REMOVE_WITH_PD_ON)) && + dev != gd->cur_serial_dev) dev_power_domain_off(dev); if (flags_remove(flags, drv->flags)) { |