Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753301AbZCNB1e (ORCPT ); Fri, 13 Mar 2009 21:27:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753361AbZCNBUJ (ORCPT ); Fri, 13 Mar 2009 21:20:09 -0400 Received: from kroah.org ([198.145.64.141]:34929 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753216AbZCNBUD (ORCPT ); Fri, 13 Mar 2009 21:20:03 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:34 2009 Message-Id: <20090314011034.489449203@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:09:58 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Dmitriy Taychenachev Subject: [patch 021/114] USB: cdc-acm: add usb id for motomagx phones References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=usb-cdc-acm-add-usb-id-for-motomagx-phones.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1400 Lines: 29 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Dmitriy Taychenachev commit 155df65ae11dfc322214c6f887185929c809df1b upstream. The Motorola MOTOMAGX phones (Z6, E8, Zn5 so far) are providing combined ACM/BLAN USB configuration. Since it has Vendor Specific class, the corresponding drivers (cdc-acm, zaurus) can't find it just by interface info. This patch adds usb id so the cdc-acm driver can properly handle this combined device. Signed-off-by: Dmitriy Taychenachev Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-acm.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1370,6 +1370,8 @@ static struct usb_device_id acm_ids[] = { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, + { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */ + }, /* control interfaces with various AT-command sets */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/