Merge "sd: call blk_pm_runtime_init before add_disk" (421b36e9) · Commits · e / devices / android_kernel_sony_msm8994

drivers/scsi/sd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2842,6 +2842,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
		gd->events \|= DISK_EVENT_MEDIA_CHANGE;
		}

		blk_pm_runtime_init(sdp->request_queue, dev);
		add_disk(gd);
		if (sdkp->capacity)
		sd_dif_config_host(sdkp);
		@@ -2850,7 +2851,6 @@ static void sd_probe_async(void *data, async_cookie_t cookie)

		sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
		sdp->removable ? "removable " : "");
		blk_pm_runtime_init(sdp->request_queue, dev);
		scsi_autopm_put_device(sdp);
		put_device(&sdkp->dev);
		}