]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
driver core: auxiliary bus: Fix IS_ERR() vs NULL mixup in __devm_auxiliary_device_cre...
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 23 Apr 2025 10:04:26 +0000 (13:04 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 14:01:47 +0000 (16:01 +0200)
This code was originally going to use error pointers but we decided it
should return NULL instead.  The error pointer code in
__devm_auxiliary_device_create() was left over from the first version.
Update it to use NULL.  No callers have been merged yet, so that makes
this change simple and self contained.

Fixes: eaa0d30216c1 ("driver core: auxiliary bus: add device creation helpers")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Leon Romanovsky <leon@kernel.org>
Link: https://lore.kernel.org/r/aAi7Kg3aTguFD0fU@stanley.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/auxiliary.c

index a6d46c2759be81a0739f07528d5959c2a76eb8a8..fd7efd2c94e13d0fb40f16fe730077ecbf2515c0 100644 (file)
@@ -481,13 +481,13 @@ struct auxiliary_device *__devm_auxiliary_device_create(struct device *dev,
        int ret;
 
        auxdev = auxiliary_device_create(dev, modname, devname, platform_data, id);
-       if (IS_ERR(auxdev))
-               return auxdev;
+       if (!auxdev)
+               return NULL;
 
        ret = devm_add_action_or_reset(dev, auxiliary_device_destroy,
                                       auxdev);
        if (ret)
-               return ERR_PTR(ret);
+               return NULL;
 
        return auxdev;
 }