From nobody Thu Feb 24 19:56:53 2022 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 D6B8119E154E; Thu, 24 Feb 2022 19:56:53 +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 4K4Nw54Hntz4ZfB; Thu, 24 Feb 2022 19:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645732613; 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=E+DzAIy2Q9beZDqwqtMAOfV3bsmZAJlaqrlCuTm2j2A=; b=S0wglYa2hNiPz2rUCQOKTzLeGEwSzH8tLAy9N1JzqYHZqAGW35q/EBieNm9cRE+c/9eO+Y dHYZB4ncXKAiJO5lARYqYfHgwcKBvD2jycfrLVRvKs1GxX/IqawMGtQVdUANOSSCQYgqLi UasiDhNnc+ucJZS8hOyIaG+Oj3SsRZxdvmOjodZC3CIRoFz1HCXcJFSQEgYZmePkqeLGRp YW84/nbuwIdcdweNi+uT0WXJZlylcPIVJSJL8LZ89+JsI0THwAox3qaWpgXl6i4186kRRU 7QixJr9JDW7gil9cpclLilta1CClmx83v5GWAPTIO9n/JszihVV33y3sTmtlpQ== 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 6FE621214B; Thu, 24 Feb 2022 19:56:53 +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 21OJurrx095296; Thu, 24 Feb 2022 19:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21OJurGu095295; Thu, 24 Feb 2022 19:56:53 GMT (envelope-from git) Date: Thu, 24 Feb 2022 19:56:53 GMT Message-Id: <202202241956.21OJurGu095295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 810ca5629aae - main - LinuxKPI: USB change successful probe result to BUS_PROBE_DEFAULT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 810ca5629aae1c525f29fae5498a64b596736094 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645732613; 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=E+DzAIy2Q9beZDqwqtMAOfV3bsmZAJlaqrlCuTm2j2A=; b=x2wyDzzfmeciXOiqYjxAnD/Jelr19+fZDm7ky9GM1lCEoCSnTp6XO7nE8ZCTrMhheUO2U1 7bNWV0vJB0bHsdmz57/dmvVUq1rcbovoLtw0rUbOaQ9OBkJbqBFjCMYzCfKR6WOKSS4ijk kWrgYrsOeCM5RFsSK5RbPuSJ74fwLkwnwkObbbO9c2NreAC6/8mnfd5F6Cx3/ER3xblbp8 RretwV+qhjFnB3DcEHXzCNPnJwVFZiSTRJVjkakOSzLPa7HMN92VmGjMNpz/nxLlfLrw35 GZYpB2VD+/N8seUyHlg9T3TRXTy5Ra/WN2cIRD6NAiuz4ZG+scrpNTZ395Odhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645732613; a=rsa-sha256; cv=none; b=SIkQdVCC+CkeKIsrWWZxIRMK0rU5vkjU1npcTAJqW96+WzNinPiF+V2OD0GLfiv6Y1jtFw uEHzXs8lGAeVAMvhEiB5/NM52PY6gIo3gyrzakwuebbEe5Egq4TppDeO8BR9LFZAszzaFS np05UQBf4WCxbvWQrRMrx/OX5PJsbnKmYydW5+/6PqWzLky9n5/w1Z4O2Z4MGRqbrzyBKd 7u9CBAkzZ8JDoD9ri1G9oitAJf4NDz4UUGz1I/wyftQEFS+lzwhrIfkrk/Jhls/VodNfXW jV6SPPM/iklamc+SiAu+OvjZ/RhpZdL82DxD+UaIHeZ+c1JYnqF6wAp+0iK7Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=810ca5629aae1c525f29fae5498a64b596736094 commit 810ca5629aae1c525f29fae5498a64b596736094 Author: Bjoern A. Zeeb AuthorDate: 2022-02-18 22:16:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-24 19:55:19 +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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D34317 --- 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 fec5936e7640..05fb63b93142 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; } }