Commit 2806c6b8 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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.

Fixes: eaa0d302 ("driver core: auxiliary bus: add device creation helpers")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarLeon Romanovsky <leon@kernel.org>
Link: https://lore.kernel.org/r/aAi7Kg3aTguFD0fU@stanley.mountain


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8117b017

drivers/base/auxiliary.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}