]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
usb: host: ohci-exynos: fix PHY error handling
authorFelipe Balbi <balbi@ti.com>
Fri, 15 Mar 2013 09:05:03 +0000 (11:05 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 12:41:30 +0000 (14:41 +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/ohci-exynos.c

index e3b7e85120e44480ead256132098f7c7d3418710..4b469e050208037118efaaea00967b3a1bb7c6f1 100644 (file)
@@ -128,7 +128,7 @@ static int exynos_ohci_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");