From nobody Wed Jun 5 12:04:40 2024 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 4VvR3D5sfDz5Mk4g; Wed, 05 Jun 2024 12:04:40 +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 4VvR3D5NXPz4kDY; Wed, 5 Jun 2024 12:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717589080; 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=WOgr7Mhxah5DrD88gvgnxfNfQZfUgMvQ3uaAYL7aoMg=; b=S8xe4eSxKZAVqWuz+IfdwrvD40M02fivqJDEu3ytlF7g6ttfQWHFPZpsUWNn7o5/2JSvHa +ugTvTm91yCj2mZpfcK70hBU9AV5i/Uo/BgQr1aBn8STH9nFTsNyaDIBJEGPviUFQmMI9u AlwSfFOANjVZRG0CfWyTlpLd6EcSv0vXqTZ6vTwa4SvTT0tgC4Vlc0frKcI2/c5aDQk2vn FrTZ7B/QDbEWGpkoQV/q551t1lOgGNIVeElhrIPUSLNkgUewOB8yH2X7Fg7NXDWnjXeRIy eeRMyEOOdL8GaJmNXDZ6LrBxK+glABBr3178vakVpuJ759AhbQfYMYmXRfy0tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717589080; a=rsa-sha256; cv=none; b=hpm3Acui9pG3A/0dtaVc8Uq4XFbsGPseEOAP1yDzmE2gXR/SMIMRnVX/yuvnuSIMENFBSx jPQ5MyO1edOc/N1kjIHW9Exz0iUVToY8bmYll9+9cK8CiY9mv08tF7lc81NgroRuGSMT17 I5HZ1XjdNho+PP19t7LSbaADJmenesirV8RaZJDKHR5zG+6M8XBJsP8EYnu0FZm3cSegjL SE9v4PB51l6GHISPph+OmGViBqSG5kWn1cUptpJVQ+lswtPeMs3Ng6r7nRq3MTmb0i4XMC ETwUh/+HlQJzEYXvHXVGcMjqyZmDJkOgu9bnTzVIxZxKkthwi2c41nHFvBTgsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717589080; 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=WOgr7Mhxah5DrD88gvgnxfNfQZfUgMvQ3uaAYL7aoMg=; b=ANv0e9i12x+I0+n6fF0GQxN5yRrNZPScC6R/EGZIiiZVwwPa5TjslHXfMdrJg7cwzQ+wMT cjVxCmV3NidbvHreDtV5V7MZqStPTldaqY4QINM3YIllHRWuEesSTWnk03xLgIJrIpiCT2 g8hN9yt1uinhKSeMk5lSm8zCtwXlwCoVLLf8w/71aSpw20Ikh1VX/FwmOX8ZFcTm/VNbdx fGwtLpyqMsoHOidz3F4DuXTQGwFqctOEXZaDtA8PoRYOQ3uimcoDb4tgRIdHMivwOT5jgr QismN5oN5qzqJ4/v7kuaguBcOD3KBqbhEHasfkSm962QpUWjEM9aM2HZuq9aog== 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 4VvR3D4rJWz1185; Wed, 5 Jun 2024 12:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 455C4eHJ098229; Wed, 5 Jun 2024 12:04:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455C4et4098226; Wed, 5 Jun 2024 12:04:40 GMT (envelope-from git) Date: Wed, 5 Jun 2024 12:04:40 GMT Message-Id: <202406051204.455C4et4098226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 4eb82e65a73f - main - hidbus(4): Fix wrong assertion of bus 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4eb82e65a73f6cd180700bb8ae47227a553f94ed Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4eb82e65a73f6cd180700bb8ae47227a553f94ed commit 4eb82e65a73f6cd180700bb8ae47227a553f94ed Author: Zhenlei Huang AuthorDate: 2024-06-05 12:03:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-05 12:03:27 +0000 hidbus(4): Fix wrong assertion of bus Reviewed by: wulf Fixes: 4151ac9f1292 hidbus(4): Use generic hid methods to ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45496 --- sys/dev/hid/hidbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index 99bfd7715c24..f50abd4b0a4d 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -604,7 +604,7 @@ hidbus_set_intr(device_t child, hid_intr_t *handler, void *context) static int hidbus_intr_start(device_t bus, device_t child) { - MPASS(bus = device_get_parent(child)); + MPASS(bus == device_get_parent(child)); struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc; @@ -630,7 +630,7 @@ hidbus_intr_start(device_t bus, device_t child) static int hidbus_intr_stop(device_t bus, device_t child) { - MPASS(bus = device_get_parent(child)); + MPASS(bus == device_get_parent(child)); struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc;