| From 0a86eabab1d89cd947a550098670c4cbbb5c00be Mon Sep 17 00:00:00 2001 |
| From: Zefan Li <lizefan@huawei.com> |
| Date: Sun, 9 Oct 2016 19:23:12 +0800 |
| Subject: [PATCH 4/4] 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> |
| --- |
| drivers/usb/core/otg_whitelist.h | 5 ----- |
| drivers/usb/core/quirks.c | 4 ---- |
| 2 files changed, 9 deletions(-) |
| |
| --- 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 |
| 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. |
| */ |
| --- a/drivers/usb/core/quirks.c |
| +++ b/drivers/usb/core/quirks.c |
| @@ -184,10 +184,6 @@ static const struct usb_device_id usb_in |
| { 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 */ |
| }; |
| |
