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

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

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 6bd6f1c419677e5a4abbedf0f90889b88c424caa..d4f0c98428cbacbef7767c8d375867aaf87cf529 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2689,7 +2689,7 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
        }
 
        di->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
-       if (!di->usb_phy) {
+       if (IS_ERR_OR_NULL(di->usb_phy)) {
                dev_err(di->dev, "failed to get usb transceiver\n");
                ret = -EINVAL;
                goto free_usb;