diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-20 09:06:02 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-20 09:06:36 +0400 |
| commit | 9e05f9f300828aecb84659cedc6399b7a76683ef (patch) | |
| tree | c335cb4d73c1b6f222fa855756c7096b7f1308e3 /drivers/usb/phy/phy.c | |
| parent | a501fd37f77a703a8710af8f6964e0ae269df973 (diff) | |
| parent | c7cff54d5926e3f419c23eff2ebaf6f5e12da05d (diff) | |
| download | linux-9e05f9f300828aecb84659cedc6399b7a76683ef.tar.xz | |
Merge tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup
Merge "ARM: sirf: machine update for 3.16" from Barry Song:
Most of them fix some minor checkpatch issues according to key customers'
requirement. And this patchset also cleanups the clk of clocksource: move
to get clk by dts properity.
* tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
clocksource:sirf: remove the hardcode for the clk of timers
irqchip: sirf: fix one minor checkpatch issue
clocksource: prima2: fix some minor checkpatch issues
ARM: prima2: rstc: fix some minor checkpatch issues
+ Linux 3.15-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/usb/phy/phy.c')
| -rw-r--r-- | drivers/usb/phy/phy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 8afa813d690b..36b6bce33b20 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -132,6 +132,9 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type) if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) { pr_debug("PHY: unable to find transceiver of type %s\n", usb_phy_type_string(type)); + if (!IS_ERR(phy)) + phy = ERR_PTR(-ENODEV); + goto err0; } |