From 9523b1479d13b3ef44c0941255b2ee2d65824725 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Wed, 17 Apr 2013 11:24:25 +0300 Subject: [PATCH] --- yaml --- r: 364857 b: refs/heads/master c: 2bef64b89ae315e7935067ce8db901783deaf857 h: refs/heads/master i: 364855: 39067c3d3248d28abe88c03a7ec8c799165865b4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 819113d2c4a1..d58d64a6ab09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c4ebe68ecdeaa6b2846863c29e248615c366e19 +refs/heads/master: 2bef64b89ae315e7935067ce8db901783deaf857 diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c index 5de3e43ded50..3d1491b5f360 100644 --- a/trunk/drivers/usb/host/ehci-omap.c +++ b/trunk/drivers/usb/host/ehci-omap.c @@ -175,12 +175,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) phy = devm_usb_get_phy_by_phandle(dev, "phys", i); else phy = devm_usb_get_phy_dev(dev, i); - if (IS_ERR(phy) || !phy) { + if (IS_ERR(phy)) { /* Don't bail out if PHY is not absolutely necessary */ if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) continue; - ret = IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV; + ret = PTR_ERR(phy); dev_err(dev, "Can't get PHY device for port %d: %d\n", i, ret); goto err_phy;