projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f3ed4e)
usb: host: ehci-s5p: fix PHY error handling
authorFelipe Balbi <balbi@ti.com>
Fri, 15 Mar 2013 09:04:15 +0000 (11:04 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:18:31 +0000 (11:18 +0200)
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>
drivers/usb/host/ehci-s5p.c patch | blob | blame | history

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 20ebf6a8b7f4736c9cd448a9653de41b9d88c48a..867a92390ef9571d622da3bfe8c74e19497b245a 100644 (file)
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -139,7 +139,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-       if (IS_ERR_OR_NULL(phy)) {
+       if (IS_ERR(phy)) {
                /* Fallback to pdata */
                if (!pdata) {
                        dev_warn(&pdev->dev, "no platform data or transceiver defined\n");