kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] scsi_pm: set device runtime state before parent suspended

Browse source 
There is a race in scsi_bus_resume_common when set device's runtime
state to active after pm_runtime_put_sync(dev->parent).

Parent device may have been suspended so pm_runtime_set_active(dev) will
fail with -EBUSY.

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Lin Ming 2012-07-06 12:06:57 +08:00 committed by James Bottomley
parent 4bdd03e61b
commit 33a2285d96
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/scsi/scsi_pm.c
View file

@ -76,23 +76,24 @@ static int scsi_bus_resume_common(struct device *dev)
{ {
int err = 0; int err = 0;
if (scsi_is_sdev_device(dev)) { /*
/* * Parent device may have runtime suspended as soon as
* Parent device may have runtime suspended as soon as * it is woken up during the system resume.
* it is woken up during the system resume. *
* * Resume it on behalf of child.
* Resume it on behalf of child. */
*/ pm_runtime_get_sync(dev->parent);
pm_runtime_get_sync(dev->parent);
err = scsi_dev_type_resume(dev);
pm_runtime_put_sync(dev->parent);
}
if (scsi_is_sdev_device(dev))
err = scsi_dev_type_resume(dev);
if (err == 0) { if (err == 0) {
pm_runtime_disable(dev); pm_runtime_disable(dev);
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
} }
pm_runtime_put_sync(dev->parent);
return err; return err;
} }