From nobody Sat Jun 08 03:29:20 2024 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 4Vx3TD3nfqz5NBnH; Sat, 08 Jun 2024 03:29:20 +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 4Vx3TD3HnBz43Rg; Sat, 8 Jun 2024 03:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717817360; 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=oWkiCexm1dWUaCJJ9ydqEPAMlZfo++/D9kh5m1ZFoDs=; b=POURLuYZaDEuXQbBFhYKUOuLodngdwdRXdHGisA7+emI18ZLVCZtjLf9gVUL6jHLUIMTrI isa+oFSEErQKWRRx7lHhEmexC8L/rZXfDDmexAgoxljWVdl55Pb+k4cbE/WoPfFepnvVkw rpD5Aenh86vOcqoV58Edw3xjJ2ChKChdUL7ZknyVU3ag2EmDaeEWdbKFNGPzHpzhtEDnvq UJm8q8674R9FVG+1uCcPSypPdCPMbwECxRgKxv4Xv+cwieSTp/w4KTxb6Z+lEU7s5sruc5 UKQNO1RermipfjG+MTWeWissIkb4GR1jGKl+Zmj0sSyHCO+9dsmG5s7Ko0uTcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717817360; a=rsa-sha256; cv=none; b=XHOTp8L5wcmRKMvjB+FqwR/KdnL9uP3M4nZ2E9bK5PK3MHER/7PRVoBxruallEkd5Gzp6d NNZ8WcbrLJ0RvYsuQNVub5QihUO2DFP97FAVuLaaDfK9HiUfaC42tJ+tmMjQsIO7sD/1Nn 6yeQkpmu0NNgkwuuYPYgm66Xmh0gBR86Fni5gHBJoOiEyXIcuVvx6zipZ6wHIsVQllvaHL G/OMBMz2m2ZzXkejm9rNALoqsUfwajYC388nqdL7vnzO/NEH1Rik9ouXkw2HnKMgu8FtaZ VQt2I8ldbV1NQfVrzLKI9K0MnoXmh2D9wlnmYogNywQtynFRKo/EQo1vujpmSA== 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=1717817360; 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=oWkiCexm1dWUaCJJ9ydqEPAMlZfo++/D9kh5m1ZFoDs=; b=K8x7Ep3YIS7k6n4yXvmXhT8Dx1d7BuiPdAmvjD5Ct/ABAFQIGCJQlTlazvKha/UvbCMWZl W+F4h6LQOzPkMZ0+3+IzAetd8I+Zw7GBiiDQb7olL8nq8d+RtLseoACAsrrktw0qWDsJWA H9fSc3lNAapBa6jKL5UJIAimVN3aKxRRGCRZui49t9d6W32Np5Qm/lvLGly0QqRbjzIzkV VUB+QWloB3pTTHwjH/WXHoEkzYRVf/JTXMMEW0Pe5owaJJIRnKscnB37kbwcLoWgM3NcsS uKdY5WYoZK/ny1fFf5M0CYr/aIPdfAJLF8GvCBHDWlmBvMQE6HW8Nq3a+81+hA== 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 4Vx3TD2pR2zhXl; Sat, 8 Jun 2024 03:29:20 +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 4583TKg3057352; Sat, 8 Jun 2024 03:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4583TKHI057349; Sat, 8 Jun 2024 03:29:20 GMT (envelope-from git) Date: Sat, 8 Jun 2024 03:29:20 GMT Message-Id: <202406080329.4583TKHI057349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5c20fc180d1d - stable/14 - hidbus(4): Fix wrong assertion of bus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c20fc180d1d3e8a25260832c2e5dab0630178ab Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5c20fc180d1d3e8a25260832c2e5dab0630178ab commit 5c20fc180d1d3e8a25260832c2e5dab0630178ab Author: Zhenlei Huang AuthorDate: 2024-06-05 12:03:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-08 03:28:54 +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 (cherry picked from commit 4eb82e65a73f6cd180700bb8ae47227a553f94ed) --- 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 cddc6c961195..fd73136c289f 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -605,7 +605,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; @@ -631,7 +631,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;