From owner-p4-projects@FreeBSD.ORG Tue Feb 9 15:59:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E478C1065679; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A93911065672 for ; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 975418FC08 for ; Tue, 9 Feb 2010 15:59:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o19FxL1T029638 for ; Tue, 9 Feb 2010 15:59:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o19FxLuw029636 for perforce@freebsd.org; Tue, 9 Feb 2010 15:59:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 9 Feb 2010 15:59:21 GMT Message-Id: <201002091559.o19FxLuw029636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 15:59:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=174516 Change 174516 by hselasky@hselasky_laptop001 on 2010/02/09 15:59:14 USB modem: - make umodem more tolerant for devices which modem descriptors are misplaced. - reported by: Erick Wales - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#21 (text+ko) ==== @@ -312,11 +312,16 @@ 0 - 1, UDESCSUB_CDC_UNION, 0 - 1); if ((cud == NULL) || (cud->bLength < sizeof(*cud))) { - device_printf(dev, "no CM or union descriptor\n"); - goto detach; + device_printf(dev, "Missing descriptor. " + "Assuming data interface is next.\n"); + if (sc->sc_ctrl_iface_no == 0xFF) + goto detach; + else + sc->sc_data_iface_no = + sc->sc_ctrl_iface_no + 1; + } else { + sc->sc_data_iface_no = cud->bSlaveInterface[0]; } - - sc->sc_data_iface_no = cud->bSlaveInterface[0]; } else { sc->sc_data_iface_no = cmd->bDataInterface; }