Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1aa6089 authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

[media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test 

Rewrite a duplicated test to test the correct value

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression E;
@@

(
* E
  || ... || E
|
* E
  && ... && E
)
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 53e5ab94

drivers/media/video/s5p-fimc/fimc-capture.c

+4 −3
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx, 
			mf->code = 0;

			continue;

		}

		if (mf->width != tfmt->width || mf->width != tfmt->width) {

		if (mf->width != tfmt->width || mf->height != tfmt->height) {

			u32 fcc = ffmt->fourcc;

			tfmt->width  = mf->width;

			tfmt->height = mf->height;
@@ -702,7 +702,8 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx, 
					       NULL, &fcc, FIMC_SD_PAD_SOURCE);

			if (ffmt && ffmt->mbus_code)

				mf->code = ffmt->mbus_code;

			if (mf->width != tfmt->width || mf->width != tfmt->width)

			if (mf->width != tfmt->width ||

			    mf->height != tfmt->height)

				continue;

			tfmt->code = mf->code;

		}
@@ -710,7 +711,7 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx, 
			ret = v4l2_subdev_call(csis, pad, set_fmt, NULL, &sfmt);



		if (mf->code == tfmt->code &&

		    mf->width == tfmt->width && mf->width == tfmt->width)

		    mf->width == tfmt->width && mf->height == tfmt->height)

			break;

	}