diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-16 11:35:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-16 11:35:33 -0400 |
commit | edffaa031e50f913f0272516b39dd1cad7aa4aea (patch) | |
tree | 7addb06d0f2259834cb2bc2b2d007c03752d21a6 /include | |
parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
parent | 92b0abf80c5c5f0e0d71d1309688a330fd74731b (diff) |
Merge tag 'fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
usb: fixes for v3.4-rc cycle
Here are the fixes I have queued for v3.4-rc cycle so far.
It includes fixes on many of the gadget drivers and a few
of the UDC controller drivers.
For musb we have a fix for a kernel oops when unloading
omap2430.ko glue layer, proper error checking for pm_runtime_*,
fix for the ULPI transfer block, and a bug fix in musb_cleanup_urb
routine.
For s3c-hsotg we have mostly FIFO-related fixes (proper TX FIFO
allocation, TX FIFO corruption fix in DMA mode) but also a couple
of minor fixes (fixing maximum packet size for ep0 and fix for
big transfers with DMA).
For the dwc3 driver we have a memory leak fix, a very important
fix for USB30CV with SetFeature tests and the hability to handle
ep0 requests bigger than wMaxPacketSize.
On top of that there's a bunch of gadget driver minor fixes adding
proper section annotations, and fixing up the sysfs interface for
doing device-initiated connect/disconnect and so on.
All patches have been pending on the mailing list for quite a while
and look good for your for-linus branch.
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/otg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index f67810f8f21b..38ab3f46346f 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h | |||
@@ -94,6 +94,7 @@ struct usb_phy { | |||
94 | 94 | ||
95 | struct usb_otg *otg; | 95 | struct usb_otg *otg; |
96 | 96 | ||
97 | struct device *io_dev; | ||
97 | struct usb_phy_io_ops *io_ops; | 98 | struct usb_phy_io_ops *io_ops; |
98 | void __iomem *io_priv; | 99 | void __iomem *io_priv; |
99 | 100 | ||