| From foo@baz Tue Mar 24 11:01:55 CET 2015 |
| From: Ondrej Zary <linux@rainbow-software.org> |
| Date: Wed, 18 Mar 2015 23:01:01 +0100 |
| Subject: Revert "net: cx82310_eth: use common match macro" |
| |
| From: Ondrej Zary <linux@rainbow-software.org> |
| |
| [ Upstream commit 8d006e0105978619fb472e150c88b0d49337fe2b ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/usb/cx82310_eth.c | 11 ++++++++++- |
| 1 file changed, 10 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/usb/cx82310_eth.c |
| +++ b/drivers/net/usb/cx82310_eth.c |
| @@ -302,9 +302,18 @@ static const struct driver_info cx82310_ |
| .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 |
| }, |
| { }, |
