diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-03-15 11:04:15 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-03-18 11:18:31 +0200 |
| commit | a16283e11d4443430b826c7b131a244e494ac53c (patch) | |
| tree | f7a69e58d53606b3a991013118a61a727000603b /drivers/usb/host | |
| parent | 6f3ed4ec182d191d1ba48fbf5aed021d2d00dd37 (diff) | |
| download | linux-next-a16283e11d4443430b826c7b131a244e494ac53c.tar.gz | |
usb: host: ehci-s5p: 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')
| -rw-r--r-- | drivers/usb/host/ehci-s5p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 20ebf6a8b7f4..867a92390ef9 100644 --- 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"); |