summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManYi Li <limanyi@uniontech.com>2021-06-11 17:44:02 +0800
committerLee Jones <joneslee@google.com>2021-09-08 07:57:36 +0100
commit2979bf52733a085c34b24337babfd70c84d65050 (patch)
treec0d21f08ccfbd2fdb147d2f24c7811d230b283d1
parent3399468ce44ed793a097bd30dbaa884438009b95 (diff)
downloadmediatek-2979bf52733a085c34b24337babfd70c84d65050.tar.gz
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> Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I92cc938e008935b94cae17ed9f6c65b9cc0551c6
-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 849d776e2f8f..cf9aca384cfc 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;
}