diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-15 12:52:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-15 12:52:04 -0400 |
| commit | 4089ffd7665fabfbceb8bbbdce458fcc416f3733 (patch) | |
| tree | a7a7c891c71025e45903ac9d37eab4eec684151a /include/linux | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | 4e0aa635d069478e73ad95ff21fd4ae144faa189 (diff) | |
Merge tag 'fixes-for-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.10-rc2
Here's the initial set of fixes for v3.10-rc series. It countains miscellaneous
fixes in numerous drivers.
Many gadget drivers and PHY drivers learned that it's not necessary to
platform_set_drvdata() twice, that's not necessary to check the resource
pointer returned by platform_get_resource() when using devm_ioremap_resource()
and they learned that we shouldn't return 0 in case of errors.
DWC3 got a build fix for cases where DWC3 is marked as 'y' while gadget API is
marked as 'm'.
There's also a NULL pointer exception fix on usb_get_phy(), mxs-phy now knows
which PHY type it is and s3c-hsotg is now passing proper arguments to
usb_gadget_unmap_request().
Other than that there are some spelling fixes and kernel-doc warnings.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/gadget.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index c454a88abf2e..f1b0dca60f12 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -563,9 +563,8 @@ static inline int gadget_is_dualspeed(struct usb_gadget *g) } /** - * gadget_is_superspeed() - return true if the hardware handles - * supperspeed - * @g: controller that might support supper speed + * gadget_is_superspeed() - return true if the hardware handles superspeed + * @g: controller that might support superspeed */ static inline int gadget_is_superspeed(struct usb_gadget *g) { |