Merge "scsi: pm: keep request queue and scsi device runtime status in sync"

	if (err == 0 && (cb != do_scsi_runtime_resume)) {

		pm_runtime_disable(dev);

		pm_runtime_set_active(dev);

		err = pm_runtime_set_active(dev);

		pm_runtime_enable(dev);

		if (!err && scsi_is_sdev_device(dev)) {

			struct scsi_device *sdev = to_scsi_device(dev);

			/*

			 * If scsi device runtime PM is managed by block layer

			 * then we should update request queue's runtime status

			 * as well.

			 */

			if (sdev->request_queue->dev)

				blk_post_runtime_resume(sdev->request_queue, 0);

		}

	}

	return err;