From nobody Fri Nov 13 11:39:56 2026 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 4jQwKT00KSz70QMy for ; Fri, 13 Nov 2026 11:39:56 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQwKS6J6xz4P42 for ; Fri, 13 Nov 2026 11:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794569996; 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=aQP1cRJoZskAzh0obZ9MTvA5ua+m7p1FpSDv252f+2A=; b=YVe0bEuRL4TZ9mzJ149KUvXNqKtxouSa7V4X9qzv2uFuJRjlHC3hRRitBm/LInktRn0Td7 6o8Ahu1v4JiLfOEiyxUTOybP532OPzohAXk2zZeQ5YQjQtTFaBL5ktl9xw7yQAMTU6Wo6X o/ihhxPW+yj3lIMYT1HAnDALgwn2X4ka2dG5QdKJqmKBH9rxyqba7jyanoOJvt4J7yDNjn 3xS62uDmLU7cqYXPC4xNr1cE0sWNLHzqDmkInRPZnIFpMpt9Pg4qc/oRE6weHgLI+Iqujj q4seFTSvocXDhJngHA055YlGhsF6ukeW+cL+UeNyMn1qURzQ1X/8rTZuBtY9Jg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794569996; b=t70Pna6EDSHiHBkAPcptAyijA/iHrlSQXgeAVuXO1JBWgPZsUt0RLM/H54YjHq+e4ETMiM 8DyYPd12IP3HyrwjXEH2IPFV9uPC5MzPH8bbK3OBdglRZN6/Sg9vEedt5i8lTgC7fCacAV axYAcLPwGZ+AtEpzGOGxj6aOH4S493KVmL6iqhBQFDSCFRO+jD6fJFDQRge1zGh8Zsxdty x8Pk4A0tXgYumT2O56BbIEq9Tjr+S6fUUsNyGZRoyz1n4R48dRZw6ZC+fSnQubeN/gZeCq XF0UHBxd3Vooa2s9gO0/fL26HB4vCgWxFjBNrTtqrn4rSImPeJehKQhvvg/VQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794569996; 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=aQP1cRJoZskAzh0obZ9MTvA5ua+m7p1FpSDv252f+2A=; b=GhMsNS+yKmKSsQqYY4MPPT+ENvqQnONfEKWFVzoFucW0+IDGhp8++FR9zPqkhYIX/CzIAQ naw6lK4pRbSUgv65QFnteZMOV/qj4pnwRHmj9urNl2qzvm3aHyMnXS7lVdR8Mzgml2hVgj wSIfsWckLLGxWcLfKu6emfKTfUzeSvyZdKRQxVu8UFOP7+vEF5v6kooGuvKcJd9W5FeMeT xc2HtwOfLLCLnr0MimDYGv6YmqvCewffCvfKv8xmseKU78TlZGks4kEkRN2FuGQ0YA+dCp BYCy9yZMyJ+fzlYTgLkkj0g2m92HTjW4PBIUcTPZs8mNvEUzJ+ZzFRviumjvAQ== 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 4jQwKS5yQtzYVF for ; Fri, 13 Nov 2026 11:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 13789 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 11:39:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 16bdecce64b4 - main - Revert "sound/midi: Drain the mpu401 callout before device teardown" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 16bdecce64b491e826917b438c6b1a4af078c7e7 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 11:39:56 +0000 Message-Id: <6af6f70c.13789.252d140b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=16bdecce64b491e826917b438c6b1a4af078c7e7 commit 16bdecce64b491e826917b438c6b1a4af078c7e7 Author: Christos Margiolis AuthorDate: 2026-11-13 11:39:24 +0000 Commit: Christos Margiolis CommitDate: 2026-11-13 11:39:24 +0000 Revert "sound/midi: Drain the mpu401 callout before device teardown" This was committed to main by accident, but was also buggy. This reverts commit 91539591d7f8dd8ca24ced875bd16c3ba3c7d201. --- sys/dev/sound/midi/mpu401.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 775d1905eeff..20da11216c43 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -154,10 +154,8 @@ int mpu401_uninit(struct mpu401 *m) { CMD(m, MPU_RESET); - /* Clear M_TXPEND so that the callout does not re-arm itself. */ - m->flags = 0; - callout_drain(&m->timer); midi_uninit(m->mid); + callout_drain(&m->timer); kobj_delete((kobj_t)m, M_MIDI); return 0; }