From nobody Sun Feb 27 23:43:30 2022 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 B057419D3D90; Sun, 27 Feb 2022 23:43:31 +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 4K6KpC28dyz51cQ; Sun, 27 Feb 2022 23:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646005411; 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=qoQWTdw32thDFKv2y+E1sUfKhbZ6H8aRPCwZOLWFmBM=; b=XYtndbCFNVQ+M7OmmjJRPlOx1o5E6Wot93lNRPJaH+Ravkiiu8KX3wdKY2GLZzSNgrkAea pMPKf5QIP9zsZzfBO49fXYILqpf76Kwk8SjEWgXrMPd2hx9Q8ThkDdaP2N7Jgc4tIvCmn2 OeOL886a3LTYe8JuU1hHAz3uZw4pl9RQsOMt8n6Gbfla8A6nVTZqErT/c/hiN/SUf7DvUs p0HxnPtdISAOpEEvf7Yp9/wMwDw52qGr0ImtPvEDZ/3zMwbP/j4SrchiJ68P5UYP6/DLHN Yn6vb4JMcTMRuwzSrUoHhApsFCa9K+uhOYjnbTDijLddOpMRAF3JMWwJF0cwJA== 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 1C37E10E53; Sun, 27 Feb 2022 23:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21RNhU9p002847; Sun, 27 Feb 2022 23:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RNhUaY002846; Sun, 27 Feb 2022 23:43:30 GMT (envelope-from git) Date: Sun, 27 Feb 2022 23:43:30 GMT Message-Id: <202202272343.21RNhUaY002846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6bbd9be62dfe - stable/13 - LinuxKPI: USB change successful probe result to BUS_PROBE_DEFAULT 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bbd9be62dfe9ef17f2fb77d9317cab1c58fa0c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646005411; 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=qoQWTdw32thDFKv2y+E1sUfKhbZ6H8aRPCwZOLWFmBM=; b=OUXexIH9ShJL0/5nTPZo81uL2yMynNbdwVOhexagZqJG7fDzASdLWphm4r/4Mf+HTJibM5 hjNz2CEXtJJFrgpuxltMDNKsmGyg5ENbMTa0e729doabRj6YUfRNzDNHJw/LwNNaatzdxE s6nAuIENGSYPK8nD+B1kBQDhXh9SUj4c/ses3uTEeK5CC30/lFuqQAIh4IQlWfog1EhRfF 8XYDCVYmZ+vYxzdDckW1O7Uea5tvXtltDlRqrUjWE5bngWOqmm5cI6mJm7hqVJAYDyPp/H +rMDACcFlK0xXArAxzeqz71jplyDNDecW/yQS5Ngo90nItCLND/D6qipJANiOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646005411; a=rsa-sha256; cv=none; b=uKfhsg4RouD8eSGNS5Hd41N8fccfhbkHCl19CaR6ju2qV79UuYSmgiqQep8R7gdxMJL3zt 9/vaZybSfjk6MeZGAuR0EkUcrd8mPYl5jzmiI06G8r9mc4rem6IRVU5c1q+hz1Pw9M2UYw Su7zKXUV67zVi/wwP+eAcN2PW5ZMBmkO4z8cUqz5Levgu0wnNNoLiAQa4QHxMYzCgOKz5t Y6lEn9Uw94BG8i+RWAa74dycEd1oCUmFT83gwbKCAeS74uRt6O2kWsC4A5cp1dMYOK4nuh XGH5J2dDdXc/q3DVMmpklxB4L+7qRlb7d+cMhlSm5kykpIFNLx6gkoxq3t3sdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbd9be62dfe9ef17f2fb77d9317cab1c58fa0c3 commit 6bbd9be62dfe9ef17f2fb77d9317cab1c58fa0c3 Author: Bjoern A. Zeeb AuthorDate: 2022-02-18 22:16:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-27 23:41:54 +0000 LinuxKPI: USB change successful probe result to BUS_PROBE_DEFAULT Rather than returning 0 (which is BUS_PROBE_SPECIFIC) return BUS_PROBE_DEFAULT to give other drivers a possible chance too to attach. Reported by: jhb Reviewed by: hselasky, jhb, imp Differential Revision: https://reviews.freebsd.org/D34317 (cherry picked from commit 810ca5629aae1c525f29fae5498a64b596736094) --- sys/compat/linuxkpi/common/src/linux_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_usb.c b/sys/compat/linuxkpi/common/src/linux_usb.c index 72aa561fcfbb..9474aa6be9ea 100644 --- a/sys/compat/linuxkpi/common/src/linux_usb.c +++ b/sys/compat/linuxkpi/common/src/linux_usb.c @@ -221,7 +221,7 @@ usb_linux_probe(device_t dev) mtx_lock(&Giant); LIST_FOREACH(udrv, &usb_linux_driver_list, linux_driver_list) { if (usb_linux_lookup_id(udrv->id_table, uaa)) { - err = 0; + err = BUS_PROBE_DEFAULT; break; } }