From nobody Fri May 13 22:54:50 2022 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 6D0E51AD491D; Fri, 13 May 2022 22:54: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 4L0P9R17Gvz3nvP; Fri, 13 May 2022 22:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482491; 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=e7ydZRczVBVR0y6twyE+vkCFoSnLIsGSMwS6mIo49Us=; b=ZZcraTUpCXTzT4XgWb914nt8C5A0XiG6ZL4CI6PvtDrIcFn3lYgs29tl63Wve24YpvHa+j zm9XMNzPVBJa11SSO7R5u6Kuqqt/YaVkd2AMX4sE+tPMMBOu9NlYVG0YPP5JAXuv3fWs/s 7qNv5eUKg8QU0SV8++DBEGlERAbTJ6E8eD+0DjURsDzhmR6rBUUFnSx1umb1IPxcZFNXIs 5YEUak9ZVPhsuuce8flnlgM69/hIm/kviUP2XLhLxlueN8D/vrI280axLSxAs7ufyfcuLG 27j4MqnVnrOtqCwKraw1b7916vnzebXVqcpJKXfbNA/fdQdrPoIMT1Eo8zedEg== 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 00B4F3A86; Fri, 13 May 2022 22:54:51 +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 24DMso44078315; Fri, 13 May 2022 22:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DMsoTa078314; Fri, 13 May 2022 22:54:50 GMT (envelope-from git) Date: Fri, 13 May 2022 22:54:50 GMT Message-Id: <202205132254.24DMsoTa078314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: eb9716f41b2f - stable/13 - powermac_nvram: Actually return EBUSY on error from open. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb9716f41b2fa9b9957b3f7e8b1f0486f3d8f4a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482491; 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=e7ydZRczVBVR0y6twyE+vkCFoSnLIsGSMwS6mIo49Us=; b=dB6V2SF3oq2Jn6QZmV0W63zXw/hNeUa6tscmzJpII3+LbS7JejBSqipxPaC7s7sTP78gCL 3MibXsdi+hjr/Cs14cycwa5wTM452f3WTsNF7CFxTy4sAOoPZ4KmaDvQbAzL1nDMgWQp1u vOvVW0NNkrJz4sXdwq/MfaivmHtnST+8Zh8pQHIcqol4GXPPSJa0zsdaJD3tplLi5yX47p YO4lXd3DJPrUHAknHGQHF54iRMj+gF3cEJUweJnYJlB0Iuf7Gx18A1f9nwdfyJ5//IlO+1 chas55CVI2fS3iwatDPOFsmJ8vE6QvSorBJarplxYYH3LLc561VrRN4Xy113DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652482491; a=rsa-sha256; cv=none; b=OUKJMGqNnCy36v3tVlHzAq6xQbllBM/V7ocyPFYqQwU1K+EZv0iYzXa4OwL58AcRH1Dukz jAeHEhQX74ylddmOG+tyIc4K+j1Ba+/pNiaR3ncqD6IGMVQH4+y8Tcn6WpYk/bk5/KdQov Jm2VTFq6fU528vtADRqBeKHEcvbCCouV3/lgQwrOZq3MnCPy7IMjy9uFQ8X+sOnbs0LPWj r5/4uEP0rMf8hEYXcv1LF0K0oE5xMaDc2BcqF1mS27JFBeLjnedDMz4PB2pY/GAFnVOFYt hNI000nEaINq1/8wLCa/kmLptzWHROqZdYmGJwrju7IHlMNQfg3gsTSv3ekoxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb9716f41b2fa9b9957b3f7e8b1f0486f3d8f4a8 commit eb9716f41b2fa9b9957b3f7e8b1f0486f3d8f4a8 Author: John Baldwin AuthorDate: 2022-04-12 21:58:58 +0000 Commit: John Baldwin CommitDate: 2022-05-13 20:13:33 +0000 powermac_nvram: Actually return EBUSY on error from open. (cherry picked from commit 124b6786e4de5be21e86b27c03510e62af166b48) --- sys/dev/powermac_nvram/powermac_nvram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c index 186f80b1de10..7c6c4d2bc8a1 100644 --- a/sys/dev/powermac_nvram/powermac_nvram.c +++ b/sys/dev/powermac_nvram/powermac_nvram.c @@ -218,7 +218,7 @@ powermac_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td) sc->sc_rpos = sc->sc_wpos = 0; sx_xunlock(&sc->sc_lock); - return 0; + return (err); } static int