Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / usb / phy / phy-qcom-8x16-usb.c

diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c
index 3d7af85aecb9564d23946a98e7bb48dea81bf86f..d8593adb36215733c59bdc1e57739ee04083b75a 100644 (file)
--- a/drivers/usb/phy/phy-qcom-8x16-usb.c
+++ b/drivers/usb/phy/phy-qcom-8x16-usb.c
@@ -240,10 +240,7 @@ static int phy_8x16_read_devicetree(struct phy_8x16 *qphy)
 
        qphy->switch_gpio = devm_gpiod_get_optional(dev, "switch",
                                                   GPIOD_OUT_LOW);
-       if (IS_ERR(qphy->switch_gpio))
-               return PTR_ERR(qphy->switch_gpio);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(qphy->switch_gpio);
 }
 
 static int phy_8x16_reboot_notify(struct notifier_block *this,