summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-15 11:02:56 +0200
committerFelipe Balbi <balbi@ti.com>2013-03-18 11:18:30 +0200
commite299bd93e4fb8e3fa426d30e0a0796b99052a572 (patch)
tree201f1c073539487eeca1e35026db705011b08227 /drivers/usb/host
parenta90199bb947856c24d7bf78845d24f802e09db0a (diff)
usb: host: ehci-msm: fix PHY error handling
PHY layer no longer returns NULL. We must switch from IS_ERR_OR_NULL() to IS_ERR(). Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-msm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 88a49c87e74..ebf41031195 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -145,7 +145,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
* management.
*/
phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
- if (IS_ERR_OR_NULL(phy)) {
+ if (IS_ERR(phy)) {
dev_err(&pdev->dev, "unable to find transceiver\n");
ret = -ENODEV;
goto put_hcd;