projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "driver core: fw_devlink: Add support for batching fwnode parsing"
[linux-2.6-microblaze.git]
/
drivers
/
base
/
dd.c
diff --git
a/drivers/base/dd.c
b/drivers/base/dd.c
index
b42229b
..
148e819
100644
(file)
--- a/
drivers/base/dd.c
+++ b/
drivers/base/dd.c
@@
-1117,6
+1117,8
@@
static void __device_release_driver(struct device *dev, struct device *parent)
drv = dev->driver;
if (drv) {
drv = dev->driver;
if (drv) {
+ pm_runtime_get_sync(dev);
+
while (device_links_busy(dev)) {
__device_driver_unlock(dev, parent);
while (device_links_busy(dev)) {
__device_driver_unlock(dev, parent);
@@
-1128,13
+1130,12
@@
static void __device_release_driver(struct device *dev, struct device *parent)
* have released the driver successfully while this one
* was waiting, so check for that.
*/
* have released the driver successfully while this one
* was waiting, so check for that.
*/
- if (dev->driver != drv)
+ if (dev->driver != drv) {
+ pm_runtime_put(dev);
return;
return;
+ }
}
}
- pm_runtime_get_sync(dev);
- pm_runtime_clean_up_links(dev);
-
driver_sysfs_remove(dev);
if (dev->bus)
driver_sysfs_remove(dev);
if (dev->bus)