summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManYi Li <limanyi@uniontech.com>2021-06-11 17:44:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-11 12:46:41 +0200
commit8b289e6d55a6dc2341020bc632fe7bddcd5a07d3 (patch)
tree920c7e2cdbdfeb63f11f87114c48304f763e67f2
parentc52e6f64804267cc8c9f26ab41588eeeae6fb9a7 (diff)
downloadlinux-stable-8b289e6d55a6dc2341020bc632fe7bddcd5a07d3.tar.gz
linux-stable-8b289e6d55a6dc2341020bc632fe7bddcd5a07d3.tar.bz2
linux-stable-8b289e6d55a6dc2341020bc632fe7bddcd5a07d3.zip
scsi: sr: Return appropriate error code when disk is ejected
[ Upstream commit 7dd753ca59d6c8cc09aa1ed24f7657524803c7f3 ] Handle a reported media event code of 3. This indicates that the media has been removed from the drive and user intervention is required to proceed. Return DISK_EVENT_EJECT_REQUEST in that case. Link: https://lore.kernel.org/r/20210611094402.23884-1-limanyi@uniontech.com Signed-off-by: ManYi Li <limanyi@uniontech.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/scsi/sr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 67a73ea0a615..5e51a39a0c27 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -216,6 +216,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
return DISK_EVENT_EJECT_REQUEST;
else if (med->media_event_code == 2)
return DISK_EVENT_MEDIA_CHANGE;
+ else if (med->media_event_code == 3)
+ return DISK_EVENT_EJECT_REQUEST;
return 0;
}