summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManYi Li <limanyi@uniontech.com>2021-06-11 17:44:02 +0800
committerSasha Levin <sashal@kernel.org>2021-07-07 08:22:46 -0400
commitf77f97238496aeab597d573aa1703441626da999 (patch)
tree54b3149c35b4b4ebdfda0b6a31b6303d7e549cff
parent4357ae26d4cd133a86982f23cb6b321304faac50 (diff)
downloadlinux-stable-f77f97238496aeab597d573aa1703441626da999.tar.gz
linux-stable-f77f97238496aeab597d573aa1703441626da999.tar.bz2
linux-stable-f77f97238496aeab597d573aa1703441626da999.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 fd4b582110b2..77961f058367 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -220,6 +220,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;
}