X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fscsi%2Fsr.c;fp=kernel%2Fdrivers%2Fscsi%2Fsr.c;h=64c867405ad4ff2d5e53972a8ba34f785cc81962;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=8bd54a64efd6a52aef163f0cbe4f34f5ef9ac71c;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git

diff --git a/kernel/drivers/scsi/sr.c b/kernel/drivers/scsi/sr.c
index 8bd54a64e..64c867405 100644
--- a/kernel/drivers/scsi/sr.c
+++ b/kernel/drivers/scsi/sr.c
@@ -144,6 +144,9 @@ static int sr_runtime_suspend(struct device *dev)
 {
 	struct scsi_cd *cd = dev_get_drvdata(dev);
 
+	if (!cd)	/* E.g.: runtime suspend following sr_remove() */
+		return 0;
+
 	if (cd->media_present)
 		return -EBUSY;
 	else
@@ -985,6 +988,7 @@ static int sr_remove(struct device *dev)
 	scsi_autopm_get_device(cd->device);
 
 	del_gendisk(cd->disk);
+	dev_set_drvdata(dev, NULL);
 
 	mutex_lock(&sr_ref_mutex);
 	kref_put(&cd->kref, sr_kref_release);