Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[karo-tx-linux.git] / drivers / usb / host / ehci-s5p.c

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 738490e6d4298f9046bc4296d231b2f9bfbfd45d..43a2a16732f58c1e352155a45c517681a3b26e09 100644 (file)
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -140,7 +140,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");