2024-05-08 12:38:47

by Dan Carpenter

Subject: [PATCH] media: bcm2835-unicam: Fix a NULL vs IS_ERR() check

The media_pad_remote_pad_unique() function returns error pointers, not
NULL. Update the check accordingly.

Fixes: 392cd78d495f ("media: bcm2835-unicam: Add support for CCP2/CSI2 camera interface")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/media/platform/broadcom/bcm2835-unicam.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c
index 3c7878d8d79b..ad55fc930e5b 100644
--- a/drivers/media/platform/broadcom/bcm2835-unicam.c
+++ b/drivers/media/platform/broadcom/bcm2835-unicam.c
@@ -2433,9 +2433,9 @@ static int unicam_async_bound(struct v4l2_async_notifier *notifier,
return ret;

source = media_pad_remote_pad_unique(sink);
- if (!source) {
+ if (IS_ERR(source)) {
dev_err(unicam->dev, "No connected sensor pad\n");
- return -ENOTCONN;
+ return PTR_ERR(source);
}

unicam->sensor.subdev = subdev;
--
2.43.0

2024-05-08 15:12:12

by Laurent Pinchart

Subject: Re: [PATCH] media: bcm2835-unicam: Fix a NULL vs IS_ERR() check

Hi Dan,

Thank you for the patch.

On Wed, May 08, 2024 at 03:31:00PM +0300, Dan Carpenter wrote:
> The media_pad_remote_pad_unique() function returns error pointers, not
> NULL. Update the check accordingly.
>
> Fixes: 392cd78d495f ("media: bcm2835-unicam: Add support for CCP2/CSI2 camera interface")
> Signed-off-by: Dan Carpenter <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> drivers/media/platform/broadcom/bcm2835-unicam.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c
> index 3c7878d8d79b..ad55fc930e5b 100644
> --- a/drivers/media/platform/broadcom/bcm2835-unicam.c
> +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c
> @@ -2433,9 +2433,9 @@ static int unicam_async_bound(struct v4l2_async_notifier *notifier,
> return ret;
>
> source = media_pad_remote_pad_unique(sink);
> - if (!source) {
> + if (IS_ERR(source)) {
> dev_err(unicam->dev, "No connected sensor pad\n");
> - return -ENOTCONN;
> + return PTR_ERR(source);
> }
>
> unicam->sensor.subdev = subdev;

--
Regards,

Laurent Pinchart