Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3456738pxv; Mon, 26 Jul 2021 04:44:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2Sr1PU6r9j+fkJIg3ajLWQLR0vHxa9d7AHTX7di28L0sleO8uSQjvh1MGAzeEjZBxvZwL X-Received: by 2002:a5d:8d83:: with SMTP id b3mr14524572ioj.179.1627299889863; Mon, 26 Jul 2021 04:44:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627299889; cv=none; d=google.com; s=arc-20160816; b=yKCN03T1RlOCptqCG5yqGcj3D9vHMomEUolKFAgvI/CFuB2OxbXEjwEHfhxEzSGCAv UgKQzGRQJA9fgPWJhjS1A5s4HAVC63KWuqzkdDDElprCprPmdtHt2nf2CvMimqP9lHcv 5X3BHVXIvIasQiOm7URNzqj8XPn9UqLqi/cqqSlsZFojrPy843a1+H1nBp73g6MIJaOR 9OzvXa913Nyp7LVAwfcoq9YdURcQlNzdPZFknuXB9PAneHI+2fdMR3beWf3tbDIW4uS2 021H2A6zTQCsNqhKFIvNf10Gv4JWqbSqy3NFCnd/lwT4YVjWv0EN9iO+nuOAFOXtInZW pL5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from; bh=lX9hOrdlobg41RLcwnGCQOLuU73Q+y2E8BrNjzLjLNI=; b=I4hCRbNcZC3GafBvFqTkto7aUINIU3x0tz6lKaznu9VHXUMNBEDo+wzSzlwva6395S /WyVPIXfJPDNbmWFp4GLS+xPncp2J4wjF9QxAPF3gDEEi/bM7q65/0pJxEEUJ+2lDEfR 73SbNuuM/mTSguCifmvA5fqPjsrer6stcMRR6zZkW+Kkpc3R8EIGNqm+zPWLw2wBiAis OO+2Kl9QziYFVFPM8CnWuXFQwDgVwtRPWGPc8amU2GnYF5YWK7nLWxj1fzkJ5CVAzO2k zBe/ddk+XN3jUrNDGuvAxZ1hjsibSoMPX8pdmwDqNgL+srmo3bWr/Dx5dFpY9LzSn3Zw Ecmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i16si31744251jam.109.2021.07.26.04.44.38; Mon, 26 Jul 2021 04:44:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233517AbhGZLCW (ORCPT + 99 others); Mon, 26 Jul 2021 07:02:22 -0400 Received: from smtpbguseast2.qq.com ([54.204.34.130]:53795 "EHLO smtpbguseast2.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233456AbhGZLCV (ORCPT ); Mon, 26 Jul 2021 07:02:21 -0400 X-Greylist: delayed 19360 seconds by postgrey-1.27 at vger.kernel.org; Mon, 26 Jul 2021 07:02:21 EDT X-QQ-mid: bizesmtp51t1627299758t4xbo5eq Received: from localhost.localdomain (unknown [58.240.82.166]) by esmtp6.qq.com (ESMTP) with id ; Mon, 26 Jul 2021 19:42:31 +0800 (CST) X-QQ-SSF: 01400000008000103000B00B0000000 X-QQ-FEAT: 5eVkbtW6/SC+6wAnJpFwnj0MoKG1KKSm/+cM6LG7wFKt+5jJNatP/18/vO/9U ZHwWzrwJi35bXTDxgDar70uShKHnIKKNueZMfK9tIm4ixZUwVwLhtw5QmKkuikNfCdef6eW EeSyiFlRdInbCUu3cxQzfEyOa8LaucqdN/zMWTtNralfalMgVMxok7zNSR8RdlzMHc7Wkj5 88Rew/+8AXRVjQPep+iwDGBd8ihASqw72dQlgK5DE65dMickncuR9SpAQ02Mlzo1/cEymr6 p357Oh2DnhJnsSLBk/rvwFVj8cyNNJdqpkhS4EWpMTs7gLoQe2aW1qps15eGf4xBPvo6TUR ZJkGQt9AcufwqIeJs4= X-QQ-GoodBg: 2 From: Li Manyi To: limanyi@uniontech.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH] scsi: sr: Return correct event when media event code is 3 Date: Mon, 26 Jul 2021 19:42:27 +0800 Message-Id: <20210726114227.3661-1-limanyi@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org the description for media event code 0: NoChg Media status is unchanged. the description for media event code 1: EjectRequest The Drive has received a request from the user (usually through a mechanical switch on the Drive) to eject the specified slot or media. the description for media event code 2: NewMedia The specified slot (or the Drive) has received new media, and is ready to access it. the description for media event code 3: MediaRemoval The media has been removed from the specified slot, and the Drive is unable to access the media without user intervention. This applies to media changers only. fix bug: https://bugzilla.kernel.org/show_bug.cgi?id=213759 Signed-off-by: Li Manyi --- drivers/scsi/sr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 94c254e9012e..a6d3ac0a6cbc 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -221,7 +221,7 @@ static unsigned int sr_get_events(struct scsi_device *sdev) 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 DISK_EVENT_MEDIA_CHANGE; return 0; } -- 2.20.1