From nobody Sat Nov 27 08:49:50 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 46C9718BAA37; Sat, 27 Nov 2021 08:49:51 +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 4J1QKW01NLz4hGB; Sat, 27 Nov 2021 08:49:51 +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 D0D58191CB; Sat, 27 Nov 2021 08:49:50 +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 1AR8no9p070227; Sat, 27 Nov 2021 08:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AR8noZQ070226; Sat, 27 Nov 2021 08:49:50 GMT (envelope-from git) Date: Sat, 27 Nov 2021 08:49:50 GMT Message-Id: <202111270849.1AR8noZQ070226@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: a9f6a79b2d6a - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a9f6a79b2d6a8f0ec7e63d8f1ae9876842c8678a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638002991; 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=i7AxbvFR12KBk4ArDTWdvW6q0DYicfwDZpuBx9fHxEc=; b=TCAijbea8ERhQtrQSVs131pGj6xIpSGmT9A1ShOvP3+1OSVUCDDTickfpS5P7Tzkc0EWfw eKbElK30yIh5hxa6LniPGiMWpnZQ51Qa4FojkIuvc3dseRYd6TmmUIXBghR3xM+nNat9ok m7s/wfx2p5dEmhrVHsFtxpcEopOC960ouK6IXweQTUsvOrGWSPJchMA1wvi2U0p/mJoxO3 vYgRmcWtcycUroud8gLlip/zuSTik0z417GcIsaDLeNwHHPtgJphUO4rZHbloFLdeVfuam qCMhhc/ul1MqUxM9rd3v6KNmoEGv1zCEKaSkdDcsl6dVWJrNAKQiqmBxUldrmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638002991; a=rsa-sha256; cv=none; b=YEllBPwfaFr5hjTsn0JBr6qdt00pvHrKPbswB9HWitueCQ0o0U4W0q8QMaWISqS1H1I8SC Ru51bQJ7D3+LvIxdkUil5TS4N7ZlGlK/UKmg6EePETY/mD5cF/LXoQLx0BokkyMxPzg8Sa xjYT7IWxAz9fmumWntfSUgm4o7v0qKe0hDqWsg2DkPszpqzuva35froB+UwvUuA9uAR61R srX6p6+3bwEFxe7xQTZOdVQu6Sfyws6z5W/VECngdKEt7ZCkwS3XK//deptg4NSfp7sYdT T7l1CSalp1ayzWqKD0wdmo/VFoa3471KFF1H+35lbwFK5jNmv/6HDOFHzHpwkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a9f6a79b2d6a8f0ec7e63d8f1ae9876842c8678a commit a9f6a79b2d6a8f0ec7e63d8f1ae9876842c8678a Author: Andriy Gapon AuthorDate: 2021-07-09 14:28:40 +0000 Commit: Andriy Gapon CommitDate: 2021-11-27 08:32:36 +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 62066311aa93..22a467af2f5f 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1935,7 +1935,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"); @@ -1956,7 +1956,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);