summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/pegasus.h
diff options
context:
space:
mode:
authorChris Rankin <rankincj@yahoo.com>2009-10-13 00:32:02 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-13 00:35:54 -0700
commitab854b24a2113ec0c17343e72d22b8876930d0a3 (patch)
tree454fd81d1afb7fc10542709b46c8f3b92e30e5fe /drivers/net/usb/pegasus.h
parent71fb62fb6dd4ed95e6f0240a2c627df396d9d057 (diff)
downloadop-kernel-dev-ab854b24a2113ec0c17343e72d22b8876930d0a3.zip
op-kernel-dev-ab854b24a2113ec0c17343e72d22b8876930d0a3.tar.gz
net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product IDs as the Belkin F5D5050, so we need to teach the pegasus driver to ignore adaptors belonging to the "Wireless" class 0xE0. For this one case anyway, seeing as pegasus is a driver for "Wired" adaptors. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/pegasus.h')
-rw-r--r--drivers/net/usb/pegasus.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h
index f968c83..5d02f02 100644
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
@@ -202,7 +202,11 @@ PEGASUS_DEV( "AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
DEFAULT_GPIO_RESET | PEGASUS_II )
PEGASUS_DEV( "Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121,
+/*
+ * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
+ * with the same product IDs by checking the device class too.
+ */
+PEGASUS_DEV_CLASS( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
DEFAULT_GPIO_RESET | PEGASUS_II )
PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
DEFAULT_GPIO_RESET )
OpenPOWER on IntegriCloud