diff options
| author |   Ondrej Zary <linux@rainbow-software.org> | 2015-03-18 23:01:01 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-18 22:37:38 -0400 |
| commit | 8d006e0105978619fb472e150c88b0d49337fe2b (patch) | |
| tree | 38e8082c9f2864d03899523f760ffa7c917033ca /drivers | |
| parent | Merge branch 'mlx4-net' (diff) | |
| download | linux-dev-8d006e0105978619fb472e150c88b0d49337fe2b.tar.xz linux-dev-8d006e0105978619fb472e150c88b0d49337fe2b.zip | |
Revert "net: cx82310_eth: use common match macro"
This reverts commit 11ad714b98f6d9ca0067568442afe3e70eb94845 because
it breaks cx82310_eth.
The custom USB_DEVICE_CLASS macro matches
bDeviceClass, bDeviceSubClass and bDeviceProtocol
but the common USB_DEVICE_AND_INTERFACE_INFO matches
bInterfaceClass, bInterfaceSubClass and bInterfaceProtocol instead, which are
not specified.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/cx82310_eth.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c index 3eed708a6182..fe48f4c51373 100644 --- a/drivers/net/usb/cx82310_eth.c +++ b/drivers/net/usb/cx82310_eth.c @@ -300,9 +300,18 @@ static const struct driver_info cx82310_info = { .tx_fixup = cx82310_tx_fixup, }; +#define USB_DEVICE_CLASS(vend, prod, cl, sc, pr) \ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ + USB_DEVICE_ID_MATCH_DEV_INFO, \ + .idVendor = (vend), \ + .idProduct = (prod), \ + .bDeviceClass = (cl), \ + .bDeviceSubClass = (sc), \ + .bDeviceProtocol = (pr) + static const struct usb_device_id products[] = { { - USB_DEVICE_AND_INTERFACE_INFO(0x0572, 0xcb01, 0xff, 0, 0), + USB_DEVICE_CLASS(0x0572, 0xcb01, 0xff, 0, 0), .driver_info = (unsigned long) &cx82310_info }, { }, |