From patchwork Mon Feb 20 01:35:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Talbert X-Patchwork-Id: 142098 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9AA4FB6FA8 for ; Mon, 20 Feb 2012 13:08:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797Ab2BTCH6 (ORCPT ); Sun, 19 Feb 2012 21:07:58 -0500 Received: from bear.techie.net ([205.134.185.202]:59051 "EHLO bear.techie.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327Ab2BTCH5 (ORCPT ); Sun, 19 Feb 2012 21:07:57 -0500 X-Greylist: delayed 1947 seconds by postgrey-1.27 at vger.kernel.org; Sun, 19 Feb 2012 21:07:57 EST Received: from bear.techie.net (localhost.localdomain [127.0.0.1]) by bear.techie.net (8.13.8/8.13.8) with ESMTP id q1K1ZThn016842 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 19 Feb 2012 20:35:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=techie.net; s=default; t=1329701729; bh=xzYzmwQ8G1hCkEmg+5YUfiMLckI8qyvP+iZ+ed9uY9M=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=qz1HfVGZJ6PZr68fDrKe2WJMwJ55VH5svxo/UuN52ZW0Fj3GuqoRdTIwpcJGQqJ0A EXy4qhfJKwg09KKx/ASkZdCmNNxRk0L1uqQ3dCbDrqD2ygxs6MgYi4sey8C0H9TO1k ix8975H/K6rfjnYh8MT+4LSzarTPeMTOMMnR/170= Received: from localhost (talbert@localhost) by bear.techie.net (8.13.8/8.13.8/Submit) with ESMTP id q1K1ZTCB016839 for ; Sun, 19 Feb 2012 20:35:29 -0500 X-Authentication-Warning: bear.techie.net: talbert owned process doing -bs Date: Sun, 19 Feb 2012 20:35:29 -0500 (EST) From: Scott Talbert To: netdev@vger.kernel.org Subject: [PATCH] cdc_ether/zaurus: Move Harmony 900 from cdc_ether to zaurus Message-ID: User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello, The Logitech Harmony 900 remote control appears to use the pseudo-MDLM driver, rather than the standard one. This patch simply moves the device so that it gets picked up by the correct driver. Signed-off-by: Scott Talbert --- drivers/net/usb/cdc_ether.c | 7 +++++++ drivers/net/usb/zaurus.c | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c924ea2..13919dd 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -570,6 +570,13 @@ static const struct usb_device_id products [] = { .driver_info = (unsigned long)&wwan_info, }, +/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */ +{ + USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM, + USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + /* * WHITELIST!!! * diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c index 1a2234c..246b3bb 100644 --- a/drivers/net/usb/zaurus.c +++ b/drivers/net/usb/zaurus.c @@ -349,6 +349,13 @@ static const struct usb_device_id products [] = { ZAURUS_MASTER_INTERFACE, .driver_info = OLYMPUS_MXL_INFO, }, + +/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */ +{ + USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM, + USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long) &bogus_mdlm_info, +}, { }, // END }; MODULE_DEVICE_TABLE(usb, products);