From nobody Mon Nov 24 13:35:37 2025 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 4dFRfK5zWZz6HCmT for ; Mon, 24 Nov 2025 13:35:37 +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 4dFRfK3glxz3Wmr for ; Mon, 24 Nov 2025 13:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763991337; 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=37wrGh5hbX5l8pcopMFJuifzJWEPdODIMVHG3SHebOw=; b=KvceL6JG+iys7QMcaBq26e9XFwErdkFRvJuSXEdXIp4Kx/8+1KmofuovQ9bW6Avvsbh8rt aouqyGlXnlhjI0jARwmWP/KwctvlawlIM4NkPuB+VDbiL5a4mIFUBInD0tjLX71USgVYOT hBvWtG5RXZm3yC2hRlYgaJ20wRsYX2Lq866slVjLi10jImbdcEcrb7dSql6aa8A8HA7LRg QPkmuUflgl7Kr4o93Jm9X7aTdMF9jb9HjCRipErC9ypTTEEDCCdPnFEwBNjEsJlkUgooD0 oWmN8KzaLQG2F0t77NsZmZkoXprcJzvnpDzf1tJYToslIE9dS/jXXvxZCstYgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763991337; 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=37wrGh5hbX5l8pcopMFJuifzJWEPdODIMVHG3SHebOw=; b=MQdxaKoeFH47t1xLrW2/UdlUxYpGDy2sfQ/Oy/nVCZ6Qd/KhKNzOZ5Gk8lEW/HqvAJb8Bn F70aurWC3iFZQTy2c4vUEpgm7IFNJOGjpG1d5tkL2pusUIWK5f9FsMdXBfCqilXmFyBM86 EdHayXou4qVn/NgFCeT3XrbVzAZ16uwq8hSB5NJIkNLpwCknKIVtIx6O5B1IftUWBECDRI CJzj8nUGDOqvt00Q5ATTd644z3DDb939lkk7C9Tsd2HtxDAiSOXqVZX4sBgbMm9chgdWpK c/ij/+KBbrRNk2b02grmD5dlOB4zRGZRIggS0MlT13goxVPMXmH7ZHH4AGvgWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763991337; a=rsa-sha256; cv=none; b=gXm/g4cJZu2YifXG9iwIcU8NGa6oPX171kK5Eb8KLuNM5H26R8HyfsFcJOwoIKNC2bRewe NeeY+9vb4EH4KDNAAgFsS8J+ilkO1xJiqK/jvVGKTQ1WgjBMfc9VNbYfgiZxjvB9M1TMz+ /0dHR4/Es3YWRZOrJxSkrXI5k9vnmpy3QBL5XUgpzBlIluLJ1kyoBDO2nN3Q5jN+gKGEM5 56iMLYQKxEH88r/vHzhLaEhQnG094truPIR2tJBz5N12Gmy3Y7BcIrbHXVt3ltCqfAy119 kec5JLjQUPyKoG3pnhA/75e3mDBUO/+0FQDuVvioEkWT2D2CEpbPTs19mJ1vgw== 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 4dFRfK36tmz26d for ; Mon, 24 Nov 2025 13:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26f9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 13:35:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nicolas Provost From: Christos Margiolis Subject: git: 8f8b8e4af91d - main - sound: Fix revents in midi_poll() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8f8b8e4af91d4e158caf6ba4b728482311bfc7c3 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 13:35:37 +0000 Message-Id: <69245f29.26f9a.69f58ba6@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8f8b8e4af91d4e158caf6ba4b728482311bfc7c3 commit 8f8b8e4af91d4e158caf6ba4b728482311bfc7c3 Author: Nicolas Provost AuthorDate: 2025-11-24 13:35:08 +0000 Commit: Christos Margiolis CommitDate: 2025-11-24 13:35:08 +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 --- 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);