diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:07:58 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:07:58 +0200 |
commit | 9b0dd49e3565ddc71346ba7d57079ee6233d0780 (patch) | |
tree | 1da29301348a4586351ead3443513816fcc19819 /drivers/usb/renesas_usbhs | |
parent | 3112fdde68fa4a3b0b3a3a738f9f32b4d62fdf05 (diff) | |
parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
download | linux-stable-9b0dd49e3565ddc71346ba7d57079ee6233d0780.tar.gz linux-stable-9b0dd49e3565ddc71346ba7d57079ee6233d0780.tar.bz2 linux-stable-9b0dd49e3565ddc71346ba7d57079ee6233d0780.zip |
Merge 4.8-rc5 into usb-testing
We want the USB fixes in here for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs')
-rw-r--r-- | drivers/usb/renesas_usbhs/mod_gadget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 8e326ac00c9f..86b37a8eedd4 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c @@ -1072,7 +1072,7 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv) gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED); dev_info(dev, "%stransceiver found\n", - gpriv->transceiver ? "" : "no "); + !IS_ERR(gpriv->transceiver) ? "" : "no "); /* * CAUTION |