Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764860AbZCNBsI (ORCPT ); Fri, 13 Mar 2009 21:48:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754611AbZCNBVb (ORCPT ); Fri, 13 Mar 2009 21:21:31 -0400 Received: from kroah.org ([198.145.64.141]:35563 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754550AbZCNBU7 (ORCPT ); Fri, 13 Mar 2009 21:20:59 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:42 2009 Message-Id: <20090314011042.626092557@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:10:53 -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 , "David S. Miller" Subject: [patch 076/114] zaurus: add usb id for motomagx phones References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=zaurus-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: 1529 Lines: 33 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Dmitriy Taychenachev commit 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 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 zaurus driver can properly handle this combined device. Signed-off-by: Dmitriy Taychenachev Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/zaurus.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/net/usb/zaurus.c +++ b/drivers/net/usb/zaurus.c @@ -341,6 +341,11 @@ static const struct usb_device_id produc USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long) &bogus_mdlm_info, +}, { + /* Motorola MOTOMAGX phones */ + USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM, + USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long) &bogus_mdlm_info, }, /* Olympus has some models with a Zaurus-compatible option. -- 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/