driver core: auxiliary bus: Fix IS_ERR() vs NULL mixup in __devm_auxiliary_device_create()
Subsystems (3)
PATCH v2 1/1 driver core: auxiliary bus: Fix IS_ERR() vs NULL mixup in __devm_auxiliary_device_create()
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.
---
v2: Originally I just updated the check for auxiliary_device_create()
failure and returned ERR_PTR(-ENOMEM) but obviously the auxiliary_device_create() and devm_auxiliary_device_create() functions should return the same thing, NULL.
drivers/base/auxiliary.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/auxiliary.c +3 -3
@@ -491,13 +491,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; }
Signature · 1 line
2.47.2
Quoted 8 lines · Dan Carpenter
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 <[email protected]>
Thanks !
Quoted 30 lines
---
v2: Originally I just updated the check forauxiliary_device_create()
failure and returnedERR_PTR(-ENOMEM)but obviously theauxiliary_device_create()anddevm_auxiliary_device_create()functions should return the same thing, NULL.drivers/base/auxiliary.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/base/auxiliary.c +3
-3@@ -491,13 +491,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; }
Signature · 1 line
Jerome
Quoted 8 lines · Dan Carpenter
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 <[email protected]>
Quoted 9 lines
---
v2: Originally I just updated the check forauxiliary_device_create()
failure and returnedERR_PTR(-ENOMEM)but obviously theauxiliary_device_create()anddevm_auxiliary_device_create()functions should return the same thing, NULL.drivers/base/auxiliary.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks,