From nobody Tue Apr 12 21:59:12 2022 X-Original-To: dev-commits-src-main@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 8FE1A1AFB38F; Tue, 12 Apr 2022 21:59:13 +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 4KdKPY2JWSz4hhV; Tue, 12 Apr 2022 21:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800753; 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=wuRbD3vbwEHlppYZiHQLkwEV1SX0C9IsuqOt7ii/ybI=; b=XHBqPzHRJZmYrLUIhFVj1BmKpfcjOwzOT8jJADvzigSyvwwrcGQs4LSOeFuax1T9Snwq6V HqPtXpcWzKNCsY9VgULwkFpsl7DSimIwkh07xcONLPzS8uis+C1o1wJwOwHDhO6sOGfezx vOIO1xMrSMs/RCFwMj+TGmANK2bXA/xbeK1X/d51uNTmn6IuUoakaRFB+ijS3vcKT5e6qK IgiG2fR8h5AKYGfqjMHL8TxVMN+A6qEoOhJPlnqRnRBkMGV3XUxlJPwZdlXkPOR5ol29CT 68PiyS0IUk2YEKjvmApf9cjYInEZP8q/RqO0GeguE0hbLIrwE5dlJn45Y3OG+Q== 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 C4B6B1F5CA; Tue, 12 Apr 2022 21:59:12 +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 23CLxCum035225; Tue, 12 Apr 2022 21:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CLxC5X035224; Tue, 12 Apr 2022 21:59:12 GMT (envelope-from git) Date: Tue, 12 Apr 2022 21:59:12 GMT Message-Id: <202204122159.23CLxC5X035224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 124b6786e4de - main - powermac_nvram: Actually return EBUSY on error from open. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 124b6786e4de5be21e86b27c03510e62af166b48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800753; 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=wuRbD3vbwEHlppYZiHQLkwEV1SX0C9IsuqOt7ii/ybI=; b=VhlJDBv07c7ZbDNuxEoKWRHTcLxz0MJxOPDKfeosLgtvc5XbLdBXqjohf1N2z2p22GuNN8 YXM2MyS6bjBJoz9oFE3s3+2apZPd6MJiBmrwQpyrCMUDMyRJ01qnneXg9H6leGuJtowGpy PdVC4L226T8IsKvELI6b34HM1KKdJnmmbWAFQd0yb+S2dsgxplpvwINHJ9zDsLTd42RC6c gqbpeQze0gU2f2cFtiKUFlVTAwBgFUpGbFcj/ozqawWfL8E1Bwysp3m6B8vo0L7AnxZf6R L7mhwVQ0sDUUwiOYYntJEAPhnR5vIXJGP+0jEeeWaHsYNdSv9lqmrzX1NCWgzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649800753; a=rsa-sha256; cv=none; b=gFRRG5yekS/mncpTMp8iEmZoqQAVeb9sGdvwSUwsWYdk9+FoAXwGjMnt51hUKDU+xcoXNU fZXhyWQAPFdncYH4x06UWI6k6+Nm7iToUVWZKLx8LzjTiEemyEpeEkJcHBcrRCwN6rvSxD 2Y1L1OtzmqEGqjeBSap9/7VNybrEE2UjB0HTtCvl9VHk+MakWUP3HfqE4DmkfmXbgWtvjM 97pwNQXEcpSzyqq1iqU7JqMnBTFFK8sCXJ3TK+mlTRkZy1veobm0c5HlsS2EESh+qsRWNA u2xs8r4oT5Sdl19e72334YO9mn83GBARqNnjNI6/9Hbuq+rc+5FdPstbV1+xPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=124b6786e4de5be21e86b27c03510e62af166b48 commit 124b6786e4de5be21e86b27c03510e62af166b48 Author: John Baldwin AuthorDate: 2022-04-12 21:58:58 +0000 Commit: John Baldwin CommitDate: 2022-04-12 21:58:58 +0000 powermac_nvram: Actually return EBUSY on error from open. --- 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