2020-12-30 12:59:11

by Pavel Machek

[permalink] [raw]
Subject: [PATCH] media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt()

Loop was useless as it would always exit on the first iteration. Fix
it with right condition.

Signed-off-by: Pavel Machek (CIP) <[email protected]>
Fixes: a86cf9b29e8b ("media: ipu3-cio2: Validate mbus format in setting subdev format")

index 36e354ecf71e..e8ea69d30bfd 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1269,7 +1269,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
fmt->format.code = formats[0].mbus_code;

for (i = 0; i < ARRAY_SIZE(formats); i++) {
- if (formats[i].mbus_code == fmt->format.code) {
+ if (formats[i].mbus_code == mbus_code) {
fmt->format.code = mbus_code;
break;
}

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Attachments:
(No filename) (849.00 B)
 signature.asc (201.00 B)
 Download all attachments

2020-12-30 21:23:05

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt()

Hi Pavel,

Thank you for the patch.

On Wed, Dec 30, 2020 at 01:55:50PM +0100, Pavel Machek wrote:
> Loop was useless as it would always exit on the first iteration. Fix
> it with right condition.
>
> Signed-off-by: Pavel Machek (CIP) <[email protected]>
> Fixes: a86cf9b29e8b ("media: ipu3-cio2: Validate mbus format in setting subdev format")

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

> index 36e354ecf71e..e8ea69d30bfd 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> @@ -1269,7 +1269,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
> fmt->format.code = formats[0].mbus_code;
>
> for (i = 0; i < ARRAY_SIZE(formats); i++) {
> - if (formats[i].mbus_code == fmt->format.code) {
> + if (formats[i].mbus_code == mbus_code) {
> fmt->format.code = mbus_code;
> break;
> }
>

--
Regards,

Laurent Pinchart

2021-01-02 17:31:00

by Sakari Ailus

[permalink] [raw]
Subject: Re: [PATCH] media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt()

On Wed, Dec 30, 2020 at 11:20:09PM +0200, Laurent Pinchart wrote:
> Hi Pavel,
>
> Thank you for the patch.
>
> On Wed, Dec 30, 2020 at 01:55:50PM +0100, Pavel Machek wrote:
> > Loop was useless as it would always exit on the first iteration. Fix
> > it with right condition.
> >
> > Signed-off-by: Pavel Machek (CIP) <[email protected]>
> > Fixes: a86cf9b29e8b ("media: ipu3-cio2: Validate mbus format in setting subdev format")
>
> Tested-by: Laurent Pinchart <[email protected]>
> Reviewed-by: Laurent Pinchart <[email protected]>

Thanks!

As this should go to stable, I'm adding:

Cc: [email protected] # v4.16 and up

>
> > index 36e354ecf71e..e8ea69d30bfd 100644
> > --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> > +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> > @@ -1269,7 +1269,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
> > fmt->format.code = formats[0].mbus_code;
> >
> > for (i = 0; i < ARRAY_SIZE(formats); i++) {
> > - if (formats[i].mbus_code == fmt->format.code) {
> > + if (formats[i].mbus_code == mbus_code) {
> > fmt->format.code = mbus_code;
> > break;
> > }
> >
>
> --
> Regards,
>
> Laurent Pinchart

--
Sakari Ailus