driver core: auxiliary bus: Fix IS_ERR() vs NULL check in __devm_auxiliary_device_create()
Subsystems (3)
PATCH 1/1 driver core: auxiliary bus: Fix IS_ERR() vs NULL check in __devm_auxiliary_device_create()
The auxiliary_device_create() function returns NULL. It doesn't return error pointers. Update the checking to match.
--- drivers/base/auxiliary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/auxiliary.c +2 -2
@@ -491,8 +491,8 @@ 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 ERR_PTR (-ENOMEM ); ret =devm_add_action_or_reset (dev, auxiliary_device_destroy, auxdev);
Signature · 1 line
2.47.2
Quoted 5 lines · Dan Carpenter
The
auxiliary_device_create()function returns NULL. It doesn't return error pointers. Update the checking to match.Fixes eaa0d30216c1 ("driver core: auxiliary bus: add device creation helpers")Signed-off-by Dan Carpenter <[email protected]>
Thanks for catching this mistake Dan.
The thing was initially setup to return error code. Greg asked to simply return NULL on error and I forgot to re-align the devm variant.
So I think the fix should be to check for NULL as you did but return NULL too so it is aligned with non-devm variant.
If you wish, I can handle a v2.
Quoted 19 lines
--- drivers/base/auxiliary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/base/auxiliary.c +2
-2@@ -491,8 +491,8 @@ 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 ERR_PTR (-ENOMEM ); ret =devm_add_action_or_reset (dev, auxiliary_device_destroy, auxdev);
Signature · 1 line
Jerome
Quoted 10 lines · Jerome Brunet
Quoted 5 lines · Dan Carpenter
The
auxiliary_device_create()function returns NULL. It doesn't return error pointers. Update the checking to match.Fixes eaa0d30216c1 ("driver core: auxiliary bus: add device creation helpers")Signed-off-by Dan Carpenter <[email protected]>Thanks for catching this mistake Dan.
Quoted 7 lines
The thing was initially setup to return error code. Greg asked to simply return NULL on error and I forgot to re-align the devm variant.
So I think the fix should be to check for NULL as you did but return NULL too so it is aligned with non-devm variant.
If you wish, I can handle a v2.
Of course, it's hard to resist an offer like that but I can send a v2.
regards,
dan carpenter