extcon: Fix extcon_get_extcon_dev() error handling

[platform/kernel/linux-rpi.git] / drivers / power / supply / max8997_charger.c

diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
index 25207fe..bfa7a57 100644 (file)
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@ -248,10 +248,10 @@ static int max8997_battery_probe(struct platform_device *pdev)
                dev_info(&pdev->dev, "couldn't get charger regulator\n");
        }
        charger->edev = extcon_get_extcon_dev("max8997-muic");
-       if (IS_ERR_OR_NULL(charger->edev)) {
-               if (!charger->edev)
-                       return -EPROBE_DEFER;
-               dev_info(charger->dev, "couldn't get extcon device\n");
+       if (IS_ERR(charger->edev)) {
+               dev_err_probe(charger->dev, PTR_ERR(charger->edev),
+                             "couldn't get extcon device: max8997-muic\n");
+               return PTR_ERR(charger->edev);
        }
 
        if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {