---

yaml
---
r: 214365
b: refs/heads/master
c: 92e32ea
h: refs/heads/master
i:
  214363: e917fa2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1b8edfe229b1832134827c6948d0b70029e965
+refs/heads/master: 92e32eaee288ee2e838fe76680cbaeaea25643c6

trunk/drivers/usb/atm/cxacru.c

@@ -1324,8 +1324,24 @@ static struct usbatm_driver cxacru_driver = {
 	.tx_padding	= 11,
 };
 
-static int cxacru_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+static int cxacru_usb_probe(struct usb_interface *intf,
+		const struct usb_device_id *id)
 {
+	struct usb_device *usb_dev = interface_to_usbdev(intf);
+	char buf[15];
+
+	/* Avoid ADSL routers (cx82310_eth).
+	 * Abort if bDeviceClass is 0xff and iProduct is "USB NET CARD".
+	 */
+	if (usb_dev->descriptor.bDeviceClass == USB_CLASS_VENDOR_SPEC
+			&& usb_string(usb_dev, usb_dev->descriptor.iProduct,
+				buf, sizeof(buf)) > 0) {
+		if (!strcmp(buf, "USB NET CARD")) {
+			dev_info(&intf->dev, "ignoring cx82310_eth device\n");
+			return -ENODEV;
+		}
+	}
+
 	return usbatm_usb_probe(intf, id, &cxacru_driver);
 }