Pull USB fixes from Greg KH: "Here are some USB fixes and new device ids for 3.12-rc6 The largest change here is a bunch of new device ids for the option USB serial driver for new Huawei devices. Other than that, just some small bug fixes for issues that people have reported (run-time and build-time), nothing major" * tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register usb: misc: usb3503: Fix compile error due to incorrect regmap depedency usb/chipidea: fix oops on memory allocation failure usb-storage: add quirk for mandatory READ_CAPACITY_16 usb: serial: option: blacklist Olivetti Olicard200 USB: quirks: add touchscreen that is dazzeled by remote wakeup Revert "usb: musb: gadget: fix otg active status flag" USB: quirks.c: add one device that cannot deal with suspension USB: serial: option: add support for Inovia SEW858 device USB: serial: ti_usb_3410_5052: add Abbott strip port ID to combined table as well. USB: support new huawei devices in option.c usb: musb: start musb on the udc side, too xhci: Fix spurious wakeups after S5 on Haswell xhci: fix write to USB3_PSSEN and XUSB2PRM pci config registers xhci: quirk for extra long delay for S4 xhci: Don't enable/disable RWE on bus suspend/resume.
Showing the changes to include (2 of 18 files). Show all
Unified · Split
| @@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { · 11 unmodified lines | ||
| 12 | 12 | unsigned int needs_reset:1; |
| 13 | 13 | }; |
| 14 | 14 | |
| 15 | −#if IS_ENABLED(CONFIG_NOP_USB_XCEIV) | |
| 15 | +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) | |
| 16 | 16 | /* sometimes transceivers are accessed only through e.g. ULPI */ |
| 17 | 17 | extern void usb_nop_xceiv_register(void); |
| 18 | 18 | extern void usb_nop_xceiv_unregister(void); |
| @@ -66,7 +66,9 @@ · 65 unmodified lines | ||
| 66 | 66 | US_FLAG(INITIAL_READ10, 0x00100000) \ |
| 67 | 67 | /* Initial READ(10) (and others) must be retried */ \ |
| 68 | 68 | US_FLAG(WRITE_CACHE, 0x00200000) \ |
| 69 | − /* Write Cache status is not available */ | |
| 69 | + /* Write Cache status is not available */ \ | |
| 70 | + US_FLAG(NEEDS_CAP16, 0x00400000) | |
| 71 | + /* cannot handle READ_CAPACITY_10 */ | |
| 70 | 72 | |
| 71 | 73 | #define US_FLAG(name, value) US_FL_##name = value , |
| 72 | 74 | enum { US_DO_ALL_FLAGS }; |