summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/base/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 2bf9730db056..a4c853411a6b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -4816,7 +4816,7 @@ void device_shutdown(void)
spin_unlock(&devices_kset->list_lock);
/* hold lock to avoid race with probe/release */
- if (parent && dev->bus && dev->bus->need_parent_lock)
+ if (parent)
device_lock(parent);
device_lock(dev);
@@ -4840,7 +4840,7 @@ void device_shutdown(void)
}
device_unlock(dev);
- if (parent && dev->bus && dev->bus->need_parent_lock)
+ if (parent)
device_unlock(parent);
put_device(dev);