diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:20:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:20:00 -0500 |
commit | 74e1a2a39355b2d3ae8c60c78d8add162c6d7183 (patch) | |
tree | 1ce09f285c505a774838a95cff7327a750dc85fc /drivers/usb/chipidea | |
parent | b5c78e04dd061b776978dad61dd85357081147b0 (diff) | |
parent | 6166805c3de539a41cfcae39026c5bc273d7c6aa (diff) |
Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg Kroah-Hartman:
"Here's the big USB merge for 3.9-rc1
Nothing major, lots of gadget fixes, and of course, xhci stuff.
All of this has been in linux-next for a while, with the exception of
the last 3 patches, which were reverts of patches in the tree that
caused problems, they went in yesterday."
* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
Revert "USB: EHCI: make ehci-vt8500 a separate driver"
Revert "USB: EHCI: make ehci-orion a separate driver"
Revert "USB: update host controller Kconfig entries"
USB: update host controller Kconfig entries
USB: EHCI: make ehci-orion a separate driver
USB: EHCI: make ehci-vt8500 a separate driver
USB: usb-storage: unusual_devs update for Super TOP SATA bridge
USB: ehci-omap: Fix autoloading of module
USB: ehci-omap: Don't free gpios that we didn't request
USB: option: add Huawei "ACM" devices using protocol = vendor
USB: serial: fix null-pointer dereferences on disconnect
USB: option: add Yota / Megafon M100-1 4g modem
drivers/usb: add missing GENERIC_HARDIRQS dependencies
USB: storage: properly handle the endian issues of idProduct
testusb: remove all mentions of 'usbfs'
usb: gadget: imx_udc: make it depend on BROKEN
usb: omap_control_usb: fix compile warning
ARM: OMAP: USB: Add phy binding information
ARM: OMAP2: MUSB: Specify omap4 has mailbox
ARM: OMAP: devices: create device for usb part of control module
...
Diffstat (limited to 'drivers/usb/chipidea')
-rw-r--r-- | drivers/usb/chipidea/ci13xxx_imx.h | 2 | ||||
-rw-r--r-- | drivers/usb/chipidea/core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/ci13xxx_imx.h b/drivers/usb/chipidea/ci13xxx_imx.h index 2e88accb3d67..9cd2e910b1ca 100644 --- a/drivers/usb/chipidea/ci13xxx_imx.h +++ b/drivers/usb/chipidea/ci13xxx_imx.h | |||
@@ -19,7 +19,7 @@ struct usbmisc_usb_device { | |||
19 | struct device *dev; /* usb controller device */ | 19 | struct device *dev; /* usb controller device */ |
20 | int index; | 20 | int index; |
21 | 21 | ||
22 | int disable_oc:1; /* over current detect disabled */ | 22 | unsigned int disable_oc:1; /* over current detect disabled */ |
23 | }; | 23 | }; |
24 | 24 | ||
25 | int usbmisc_set_ops(const struct usbmisc_ops *ops); | 25 | int usbmisc_set_ops(const struct usbmisc_ops *ops); |
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index aebf695a9344..57cae1f897b2 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c | |||
@@ -411,7 +411,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) | |||
411 | } | 411 | } |
412 | 412 | ||
413 | base = devm_request_and_ioremap(dev, res); | 413 | base = devm_request_and_ioremap(dev, res); |
414 | if (!res) { | 414 | if (!base) { |
415 | dev_err(dev, "can't request and ioremap resource\n"); | 415 | dev_err(dev, "can't request and ioremap resource\n"); |
416 | return -ENOMEM; | 416 | return -ENOMEM; |
417 | } | 417 | } |