From nobody Sat Nov 27 08:52:11 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 45E8018BDC2D; Sat, 27 Nov 2021 08:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J1QNC75Mzz4kYQ; Sat, 27 Nov 2021 08:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32BC1902D; Sat, 27 Nov 2021 08:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AR8qBFV082901; Sat, 27 Nov 2021 08:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AR8qBZ2082900; Sat, 27 Nov 2021 08:52:11 GMT (envelope-from git) Date: Sat, 27 Nov 2021 08:52:11 GMT Message-Id: <202111270852.1AR8qBZ2082900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 06f49eaf13bd - stable/12 - sddadone: 'error' gets assigned only errno codes, never MMC_ERR codes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 06f49eaf13bdd9a0e5f4d8e260891dede592db12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638003132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzAZH5QDJnAdOAzDUhzL0ngUEImylnbJo4e4No+pktM=; b=aWB1+EN7tO2VckeDNFpZ9MuwiJ2DziqSNvQY7mAvtxbONSrraguidx2bBYawOaHqqGafoY W5ar2K27zE1gqyytv+Q4IMbaoF36xEq7RVdMd/BlVKNxCDdr9iDrO0LdcI6bedz92qHEfv 1jO0pmIn/TElW4PtcO0J5umWVvRuLrLi1BAAcGPnWPG+4VwaKoiOwORSDNs5IV+BR7WOY4 +ED6Z3EVpyJqMtIy8IMQ/uOw9UmdGAZ9CRsTPXtKE0ubDN6VQQ3jSprDcl9ZVIMq7OaPkf oOK8yk2YdMVSAcldnePnP/F8rrSfuJzHspERL/BjaFg+dB0R7ceWUaquiCVu5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638003132; a=rsa-sha256; cv=none; b=pDRxqbkMg4N7gzNajC2Ci1U4/5XOSOB6e2P2XVCpQ4spPyrgo86nOp5gW/ez1B0k6D9bzf RgDD4PP7FnX7MwkItWAvnjaiE3jgbLk57Xv45nA7gb7sjXP5ffD6Y0XHqPc8z8NiBJ6InM 10GQHpZSca/ajFFAyx2dv3om73Q+ObbI7AF54+/zbiyjpD+LWGMj4b6EI4MakKmN0FVWeb QljkdgPGulTIdAXCRArdcTbVHxaBoPgZ36zJvWQl/744vF42wL9NT4GUE8DZ2Ri/Snf7Ty a+yuO6pNtHrpwUlH3NTChhT3SjOcMPi3IGfHkukr8t++R0yU60tx2ytbYKmD+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=06f49eaf13bdd9a0e5f4d8e260891dede592db12 commit 06f49eaf13bdd9a0e5f4d8e260891dede592db12 Author: Andriy Gapon AuthorDate: 2021-07-09 14:28:40 +0000 Commit: Andriy Gapon CommitDate: 2021-11-27 08:39:19 +0000 sddadone: 'error' gets assigned only errno codes, never MMC_ERR codes (cherry picked from commit e17b58ecbcb644f76cceda4ca7ff08f7677b5dfd) --- sys/cam/mmc/mmc_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 2587cda115cc..96898e92cb81 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1834,7 +1834,7 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb) /*reduction*/0, /*timeout*/0, /*getcount_only*/0); - error = 5; /* EIO */ + error = EIO; } else { if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) panic("REQ_CMP with QFRZN"); @@ -1855,7 +1855,7 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb) softc->outstanding_cmds--; /* Complete partition switch */ softc->state = SDDA_STATE_NORMAL; - if (error != MMC_ERR_NONE) { + if (error != 0) { /* TODO: Unpause retune if accessing RPMB */ xpt_release_ccb(done_ccb); xpt_schedule(periph, CAM_PRIORITY_NORMAL);