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

Commit 4c171636 authored by Nicolas Iooss's avatar Nicolas Iooss Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: rcar_fdp1: use %4.4s to format a 4-byte string 



Using %4s to format f->fmt.pix_mp.pixelformat in fdp1_try_fmt() and
fdp1_s_fmt() may lead to more characters being printed (when the byte
following field pixelformat is not zero).

Add ".4" to the format specifier to limit the number of printed
characters to four. The resulting format specifier "%4.4s" is also used
by other media drivers to print pixelformat value.

Signed-off-by: default avatarNicolas Iooss <nicolas.iooss_linux@m4x.org>
Reviewed-by: default avatarKieran Bingham <kieran@bingham.xyz>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d615128a

drivers/media/platform/rcar_fdp1.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1596,7 +1596,7 @@ static int fdp1_try_fmt(struct file *file, void *priv, struct v4l2_format *f) 
	else

	else

		fdp1_try_fmt_capture(ctx, NULL, &f->fmt.pix_mp);

		fdp1_try_fmt_capture(ctx, NULL, &f->fmt.pix_mp);





	dprintk(ctx->fdp1, "Try %s format: %4s (0x%08x) %ux%u field %u\n",

	dprintk(ctx->fdp1, "Try %s format: %4.4s (0x%08x) %ux%u field %u\n",

		V4L2_TYPE_IS_OUTPUT(f->type) ? "output" : "capture",

		V4L2_TYPE_IS_OUTPUT(f->type) ? "output" : "capture",

		(char *)&f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.pixelformat,

		(char *)&f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.pixelformat,

		f->fmt.pix_mp.width, f->fmt.pix_mp.height, f->fmt.pix_mp.field);

		f->fmt.pix_mp.width, f->fmt.pix_mp.height, f->fmt.pix_mp.field);
@@ -1671,7 +1671,7 @@ static int fdp1_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 




	fdp1_set_format(ctx, &f->fmt.pix_mp, f->type);

	fdp1_set_format(ctx, &f->fmt.pix_mp, f->type);





	dprintk(ctx->fdp1, "Set %s format: %4s (0x%08x) %ux%u field %u\n",

	dprintk(ctx->fdp1, "Set %s format: %4.4s (0x%08x) %ux%u field %u\n",

		V4L2_TYPE_IS_OUTPUT(f->type) ? "output" : "capture",

		V4L2_TYPE_IS_OUTPUT(f->type) ? "output" : "capture",

		(char *)&f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.pixelformat,

		(char *)&f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.pixelformat,

		f->fmt.pix_mp.width, f->fmt.pix_mp.height, f->fmt.pix_mp.field);

		f->fmt.pix_mp.width, f->fmt.pix_mp.height, f->fmt.pix_mp.field);