Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

[deliverable/linux.git] / drivers / power / isp1704_charger.c

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 090e5f9e72c9e1878b03ef5f3c2216c907584f70..122911978da22a55f810044892873c654f19661e 100644 (file)
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -416,7 +416,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        isp->phy = usb_get_phy(USB_PHY_TYPE_USB2);
-       if (!isp->phy)
+       if (IS_ERR_OR_NULL(isp->phy))
                goto fail0;
 
        isp->dev = &pdev->dev;