Commit 5039b8cf authored Mar 18, 2015 by Ondrej Zary Committed by Sasha Levin Mar 24, 2015

Revert "net: cx82310_eth: use common match macro"



[ Upstream commit 8d006e0105978619fb472e150c88b0d49337fe2b ]

This reverts commit 11ad714b 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: Sasha Levin <sasha.levin@oracle.com>

parent 3d1acc9e

drivers/net/usb/cx82310_eth.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -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
		},
		{ },