aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-exynos.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-15 05:05:03 -0400
committerFelipe Balbi <balbi@ti.com>2013-03-18 08:41:30 -0400
commit9ee1c7fbeab5b671d3b63f2dd33ad48235efcfe8 (patch)
tree87c6be283bb65304bd72e0309451fb31399882c7 /drivers/usb/host/ohci-exynos.c
parenta16283e11d4443430b826c7b131a244e494ac53c (diff)
usb: host: ohci-exynos: 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/ohci-exynos.c')
-rw-r--r--drivers/usb/host/ohci-exynos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index e3b7e85120e4..4b469e050208 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -128,7 +128,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
128 return -ENOMEM; 128 return -ENOMEM;
129 129
130 phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); 130 phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
131 if (IS_ERR_OR_NULL(phy)) { 131 if (IS_ERR(phy)) {
132 /* Fallback to pdata */ 132 /* Fallback to pdata */
133 if (!pdata) { 133 if (!pdata) {
134 dev_warn(&pdev->dev, "no platform data or transceiver defined\n"); 134 dev_warn(&pdev->dev, "no platform data or transceiver defined\n");