History

Merge tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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.

Linus Torvalds committed 13 years ago

Commit 02a32502 parents 7b4a515 944687818 files · +343 −82Browse files

Showing the changes to include (2 of 18 files). Show all

Unified · Split

2 files
  1. include/linux/usb/usb_phy_gen_xceiv.h +1 −1
  2. include/linux/usb_usual.h +3 −1
include/linux/usb/usb_phy_gen_xceiv.h+1−1
@@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { · 11 unmodified lines
12 unsigned int needs_reset:1;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/* sometimes transceivers are accessed only through e.g. ULPI */16/* sometimes transceivers are accessed only through e.g. ULPI */
17extern void usb_nop_xceiv_register(void);17extern void usb_nop_xceiv_register(void);
18extern void usb_nop_xceiv_unregister(void);18extern void usb_nop_xceiv_unregister(void);
include/linux/usb_usual.h+3−1
@@ -66,7 +66,9 @@ · 65 unmodified lines
66 US_FLAG(INITIAL_READ10, 0x00100000) \66 US_FLAG(INITIAL_READ10, 0x00100000) \
67 /* Initial READ(10) (and others) must be retried */ \67 /* Initial READ(10) (and others) must be retried */ \
68 US_FLAG(WRITE_CACHE, 0x00200000) \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#define US_FLAG(name, value) US_FL_##name = value ,73#define US_FLAG(name, value) US_FL_##name = value ,
72enum { US_DO_ALL_FLAGS };74enum { US_DO_ALL_FLAGS };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t