Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a2285d authored by Lin Ming's avatar Lin Ming Committed by James Bottomley
Browse files

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



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: default avatarLin Ming <ming.m.lin@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 4bdd03e6

drivers/scsi/scsi_pm.c

+12 −11
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static int scsi_bus_resume_common(struct device *dev) 
{

	int err = 0;



	if (scsi_is_sdev_device(dev)) {

	/*

	 * Parent device may have runtime suspended as soon as

	 * it is woken up during the system resume.
@@ -84,15 +83,17 @@ static int scsi_bus_resume_common(struct device *dev) 
	 * Resume it on behalf of child.

	 */

	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) {

		pm_runtime_disable(dev);

		pm_runtime_set_active(dev);

		pm_runtime_enable(dev);

	}



	pm_runtime_put_sync(dev->parent);



	return err;

}