diff options
| -rw-r--r-- | drivers/base/power/runtime.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index a770498a74ec..846d89e3d122 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -328,11 +328,11 @@ int __pm_runtime_resume(struct device *dev, bool from_wq) | |||
| 328 | * necessary. | 328 | * necessary. |
| 329 | */ | 329 | */ |
| 330 | parent = dev->parent; | 330 | parent = dev->parent; |
| 331 | spin_unlock_irq(&dev->power.lock); | 331 | spin_unlock(&dev->power.lock); |
| 332 | 332 | ||
| 333 | pm_runtime_get_noresume(parent); | 333 | pm_runtime_get_noresume(parent); |
| 334 | 334 | ||
| 335 | spin_lock_irq(&parent->power.lock); | 335 | spin_lock(&parent->power.lock); |
| 336 | /* | 336 | /* |
| 337 | * We can resume if the parent's run-time PM is disabled or it | 337 | * We can resume if the parent's run-time PM is disabled or it |
| 338 | * is set to ignore children. | 338 | * is set to ignore children. |
| @@ -343,9 +343,9 @@ int __pm_runtime_resume(struct device *dev, bool from_wq) | |||
| 343 | if (parent->power.runtime_status != RPM_ACTIVE) | 343 | if (parent->power.runtime_status != RPM_ACTIVE) |
| 344 | retval = -EBUSY; | 344 | retval = -EBUSY; |
| 345 | } | 345 | } |
| 346 | spin_unlock_irq(&parent->power.lock); | 346 | spin_unlock(&parent->power.lock); |
| 347 | 347 | ||
| 348 | spin_lock_irq(&dev->power.lock); | 348 | spin_lock(&dev->power.lock); |
| 349 | if (retval) | 349 | if (retval) |
| 350 | goto out; | 350 | goto out; |
| 351 | goto repeat; | 351 | goto repeat; |
| @@ -777,7 +777,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) | |||
| 777 | } | 777 | } |
| 778 | 778 | ||
| 779 | if (parent) { | 779 | if (parent) { |
| 780 | spin_lock_irq(&parent->power.lock); | 780 | spin_lock(&parent->power.lock); |
| 781 | 781 | ||
| 782 | /* | 782 | /* |
| 783 | * It is invalid to put an active child under a parent that is | 783 | * It is invalid to put an active child under a parent that is |
| @@ -793,7 +793,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) | |||
| 793 | atomic_inc(&parent->power.child_count); | 793 | atomic_inc(&parent->power.child_count); |
| 794 | } | 794 | } |
| 795 | 795 | ||
| 796 | spin_unlock_irq(&parent->power.lock); | 796 | spin_unlock(&parent->power.lock); |
| 797 | 797 | ||
| 798 | if (error) | 798 | if (error) |
| 799 | goto out; | 799 | goto out; |
