From owner-svn-src-all@FreeBSD.ORG Wed Nov 11 03:17:52 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 240E01065672; Wed, 11 Nov 2009 03:17:52 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ECB368FC08; Wed, 11 Nov 2009 03:17:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAB3HpEA080938; Wed, 11 Nov 2009 03:17:51 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAB3HpZ3080934; Wed, 11 Nov 2009 03:17:51 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200911110317.nAB3HpZ3080934@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 11 Nov 2009 03:17:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199169 - head/sys/dev/usb/input X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 03:17:52 -0000 Author: nwhitehorn Date: Wed Nov 11 03:17:51 2009 New Revision: 199169 URL: http://svn.freebsd.org/changeset/base/199169 Log: Reduce probe priority of USB input devices to BUS_PROBE_GENERIC from BUS_PROBE_SPECIFIC. This allows device-specific drivers like atp to attach reliably. Reviewed by: hps Modified: head/sys/dev/usb/input/uhid.c head/sys/dev/usb/input/ukbd.c head/sys/dev/usb/input/ums.c Modified: head/sys/dev/usb/input/uhid.c ============================================================================== --- head/sys/dev/usb/input/uhid.c Wed Nov 11 02:25:27 2009 (r199168) +++ head/sys/dev/usb/input/uhid.c Wed Nov 11 03:17:51 2009 (r199169) @@ -633,7 +633,7 @@ uhid_probe(device_t dev) if (usb_test_quirk(uaa, UQ_HID_IGNORE)) { return (ENXIO); } - return (0); + return (BUS_PROBE_GENERIC); } static int Modified: head/sys/dev/usb/input/ukbd.c ============================================================================== --- head/sys/dev/usb/input/ukbd.c Wed Nov 11 02:25:27 2009 (r199168) +++ head/sys/dev/usb/input/ukbd.c Wed Nov 11 03:17:51 2009 (r199169) @@ -749,7 +749,7 @@ ukbd_probe(device_t dev) if (usb_test_quirk(uaa, UQ_KBD_IGNORE)) return (ENXIO); else - return (0); + return (BUS_PROBE_GENERIC); } error = usbd_req_get_hid_desc(uaa->device, NULL, @@ -771,7 +771,7 @@ ukbd_probe(device_t dev) if (usb_test_quirk(uaa, UQ_KBD_IGNORE)) error = ENXIO; else - error = 0; + error = BUS_PROBE_GENERIC; } else error = ENXIO; Modified: head/sys/dev/usb/input/ums.c ============================================================================== --- head/sys/dev/usb/input/ums.c Wed Nov 11 02:25:27 2009 (r199168) +++ head/sys/dev/usb/input/ums.c Wed Nov 11 03:17:51 2009 (r199169) @@ -375,7 +375,7 @@ ums_probe(device_t dev) if ((uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) && (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE)) - return (0); + return (BUS_PROBE_GENERIC); error = usbd_req_get_hid_desc(uaa->device, NULL, &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex); @@ -385,7 +385,7 @@ ums_probe(device_t dev) if (hid_is_collection(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) - error = 0; + error = BUS_PROBE_GENERIC; else error = ENXIO;