Revert "USB: Add OTG PET device to TPL"

This reverts commit 97fa724b23c3dd22e9c0979ad0e9d260cc6d545d.

Conflicts:
	drivers/usb/core/quirks.c

Signed-off-by: Zefan Li <lizefan@huawei.com>

diff --git a/drivers/usb/core/otg_whitelist.h b/drivers/usb/core/otg_whitelist.h
index 2753cec61aafb49bbf0daea677cc2c82fe0bbf55..e8cdce571bb1cb3ae4b1748638bf817b86839160 100644 (file)
--- a/drivers/usb/core/otg_whitelist.h
+++ b/drivers/usb/core/otg_whitelist.h
@@ -59,11 +59,6 @@ static int is_targeted(struct usb_device *dev)
             le16_to_cpu(dev->descriptor.idProduct) == 0xbadd))
                return 0;
 
-       /* OTG PET device is always targeted (see OTG 2.0 ECN 6.4.2) */
-       if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1a0a &&
-            le16_to_cpu(dev->descriptor.idProduct) == 0x0200))
-               return 1;
-
        /* NOTE: can't use usb_match_id() since interface caches
         * aren't set up yet. this is cut/paste from that code.
         */

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 32e08dcc4354ee88c1ff31d0607a6f9055128a66..90f04a8e859ab7d16a1bea7bac4e5fcf41625bb0 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -184,10 +184,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = {
        { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0),
          .driver_info = USB_QUIRK_RESET_RESUME },
 
-       /* Protocol and OTG Electrical Test Device */
-       { USB_DEVICE(0x1a0a, 0x0200), .driver_info =
-                       USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },
-
        { }  /* terminating entry must be last */
 };