2023-12-04 12:29:41

by Dan Carpenter

Subject: [PATCH] platform/x86: x86-android-tablets: Fix an IS_ERR() vs NULL check in probe

The spi_new_device() function returns NULL on error, it doesn't return
error pointers.

Fixes: 70505ea6de24 ("platform/x86: x86-android-tablets: Add support for SPI device instantiation")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/platform/x86/x86-android-tablets/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
index 6a5975ac3286..f8221a15575b 100644
--- a/drivers/platform/x86/x86-android-tablets/core.c
+++ b/drivers/platform/x86/x86-android-tablets/core.c
@@ -220,8 +220,8 @@ static __init int x86_instantiate_spi_dev(const struct x86_dev_info *dev_info, i

spi_devs[idx] = spi_new_device(controller, &board_info);
put_device(&controller->dev);
- if (IS_ERR(spi_devs[idx]))
- return dev_err_probe(&controller->dev, PTR_ERR(spi_devs[idx]),
+ if (!spi_devs[idx])
+ return dev_err_probe(&controller->dev, -ENOMEM,
"creating SPI-device %d\n", idx);

return 0;
--
2.42.0

2023-12-04 14:51:51

by Hans de Goede

Subject: Re: [PATCH] platform/x86: x86-android-tablets: Fix an IS_ERR() vs NULL check in probe

Hi,

On 12/4/23 13:29, Dan Carpenter wrote:
> The spi_new_device() function returns NULL on error, it doesn't return
> error pointers.
>
> Fixes: 70505ea6de24 ("platform/x86: x86-android-tablets: Add support for SPI device instantiation")
> Signed-off-by: Dan Carpenter <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans



> ---
> drivers/platform/x86/x86-android-tablets/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
> index 6a5975ac3286..f8221a15575b 100644
> --- a/drivers/platform/x86/x86-android-tablets/core.c
> +++ b/drivers/platform/x86/x86-android-tablets/core.c
> @@ -220,8 +220,8 @@ static __init int x86_instantiate_spi_dev(const struct x86_dev_info *dev_info, i
>
> spi_devs[idx] = spi_new_device(controller, &board_info);
> put_device(&controller->dev);
> - if (IS_ERR(spi_devs[idx]))
> - return dev_err_probe(&controller->dev, PTR_ERR(spi_devs[idx]),
> + if (!spi_devs[idx])
> + return dev_err_probe(&controller->dev, -ENOMEM,
> "creating SPI-device %d\n", idx);
>
> return 0;