Merge tag 'for-v6.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[sfrench/cifs-2.6.git] / drivers / power / supply / charger-manager.c

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index d67edb760c948dbb9c0e665ecfae5c9ae5a8a7af..92db79400a6adee2701325a57df51f0cbb332292 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -985,13 +985,10 @@ static int charger_extcon_init(struct charger_manager *cm,
        cable->nb.notifier_call = charger_extcon_notifier;
 
        cable->extcon_dev = extcon_get_extcon_dev(cable->extcon_name);
-       if (IS_ERR_OR_NULL(cable->extcon_dev)) {
+       if (IS_ERR(cable->extcon_dev)) {
                pr_err("Cannot find extcon_dev for %s (cable: %s)\n",
                        cable->extcon_name, cable->name);
-               if (cable->extcon_dev == NULL)
-                       return -EPROBE_DEFER;
-               else
-                       return PTR_ERR(cable->extcon_dev);
+               return PTR_ERR(cable->extcon_dev);
        }
 
        for (i = 0; i < ARRAY_SIZE(extcon_mapping); i++) {