]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: gadget: s3c-hsotg: fix PHY error handling
authorFelipe Balbi <balbi@ti.com>
Fri, 15 Mar 2013 08:56:19 +0000 (10:56 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:18:29 +0000 (11:18 +0200)
PHY laye rno longer return NULL. We need to
switch over from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/s3c-hsotg.c

index f1ceabff7cce3e687d3acbb1f256db5d4225f208..a3cdc32115d52c646f2ae2b89ded1fcf378a9d70 100644 (file)
@@ -3467,7 +3467,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
        }
 
        phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
-       if (IS_ERR_OR_NULL(phy)) {
+       if (IS_ERR(phy)) {
                /* Fallback for pdata */
                plat = pdev->dev.platform_data;
                if (!plat) {