From nobody Fri Nov 28 14:35:31 2025 X-Original-To: dev-commits-src-branches@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 4dHwnc14H2z6HZdv for ; Fri, 28 Nov 2025 14:35:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHwnb61zTz3skB for ; Fri, 28 Nov 2025 14:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpN/l+XKNFMcLUQAWHih1HruIsi60PugloXGJq6Of/U=; b=fXmZFIYL2bT3A/mViTzCwzjHjwWPacroUW3d2lNLB5GN9ZgP77LgfRnvDC6QaLLV7/cqtA 2uGH0olceHJU64GLHiHMPnFjM0e4iVhO2iseLtxnQSp9uwqtXqBnPjmsJ3cK/GM9qnK/oU /NLqPcq/Oee4p7JZCNGlhtrPpbi0ob6D9ZzLWX+hW6jpoVHD+QicGzyPY8nBc9JCBVTOXi bpPlzz+XsimFfWxqNC7JkqMqkPTwns2+2Gj5wISclygZdBc992ot8XgyK7wPuDABbdKa+c qHUu8pmrEAy+Sv+AcUwwB8aes4AvweEVn0S2Eb70VDAZ7M/m1/5JOaN77kiGOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpN/l+XKNFMcLUQAWHih1HruIsi60PugloXGJq6Of/U=; b=YUigsNme6hvkV9dIm42THgVpyxUpM26EiMSGnWCNvOLh4f2N2vFgpzO3M4CogQ/ESGbJuW dQvLqO8e6rjtTvJCvce+0fgAV/sfGRtrbRDxwAFbFmQrYDid5K1xxL44WkJLTKPqqOSHRY ZYkGKcERIJHzDucvTLQec9AG5jNSK9NY4LGTAR6UIkplqVS9ew3lSfV0gZS7mPyASUHqX5 Jh0OgHtql4Ru0XOxHAHnFEiEcgZzMoDfG7NkQ2ghxxnciI1D4WBeHsal2tpmw0WMvNIxps nLTW+86MMQLo1j1rKaWJTCl5QnVQ2BgCkncJLp0xZzc+PRUAeriz1dkGBGtaAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764340531; a=rsa-sha256; cv=none; b=IqK9rjN64L06nYPs6sN5Da5jJlTYuIOEexLLIZEZflnce8awXnjnQI2OpuHZcdqv/+2Grz lhzf/rTf5d4ywYEEf48pWTQIHs+R9nB5n3YjD3RGP6bfyCuR0JZMMzKXAxprTcKmdEhNlI 6h2J/e+W2hNEXKgVy2ghgQgMWhc66P/RbgmCTbLoOBNQfKikSeWVSlVsaeoqE7snIN4tXM 8GiVXjyh6LWBWZfwEsC/3DVUDnntJNG5EiG/n9lp3XuKh1MjYhRlZ1gFNG6k3UO63qU9xR Xj8SFtsZIlq5iMaBA1BaodBFSRZP8Uajs8/IdTm+1Vik3vM5EXIZ89u0F2KTVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dHwnb5Pdwz15JG for ; Fri, 28 Nov 2025 14:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2a4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 14:35:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nicolas Provost From: Christos Margiolis Subject: git: b1e9512cba83 - stable/15 - sound: Fix revents in midi_poll() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b1e9512cba837df02879427a77bc3acdc1658dfc Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 14:35:31 +0000 Message-Id: <6929b333.2a4fb.67996735@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b1e9512cba837df02879427a77bc3acdc1658dfc commit b1e9512cba837df02879427a77bc3acdc1658dfc Author: Nicolas Provost AuthorDate: 2025-11-24 13:35:08 +0000 Commit: Christos Margiolis CommitDate: 2025-11-28 14:35:00 +0000 sound: Fix revents in midi_poll() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: christos Pull Request: https://github.com/freebsd/freebsd-src/pull/1887 (cherry picked from commit 8f8b8e4af91d4e158caf6ba4b728482311bfc7c3) --- sys/dev/sound/midi/midi.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index e14a28557406..cca7b93abf5f 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -658,21 +658,19 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) mtx_lock(&m->lock); mtx_lock(&m->qlock); - if (events & (POLLIN | POLLRDNORM)) + if (events & (POLLIN | POLLRDNORM)) { if (!MIDIQ_EMPTY(m->inq)) - events |= events & (POLLIN | POLLRDNORM); - - if (events & (POLLOUT | POLLWRNORM)) - if (MIDIQ_AVAIL(m->outq) < m->hiwat) - events |= events & (POLLOUT | POLLWRNORM); - - if (revents == 0) { - if (events & (POLLIN | POLLRDNORM)) + revents |= events & (POLLIN | POLLRDNORM); + else selrecord(td, &m->rsel); - - if (events & (POLLOUT | POLLWRNORM)) + } + if (events & (POLLOUT | POLLWRNORM)) { + if (MIDIQ_AVAIL(m->outq) < m->hiwat) + revents |= events & (POLLOUT | POLLWRNORM); + else selrecord(td, &m->wsel); } + mtx_unlock(&m->lock); mtx_unlock(&m->qlock);