* [PATCH 1/1] [media] v4l: rcar_fdp1: use %4.4s to format a 4-byte string
@ 2016-12-26 13:31 Nicolas Iooss
2016-12-28 9:47 ` Kieran Bingham
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Iooss @ 2016-12-26 13:31 UTC (permalink / raw)
To: Kieran Bingham, linux-media, linux-renesas-soc
Cc: linux-kernel, Nicolas Iooss
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: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
---
drivers/media/platform/rcar_fdp1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
index 674cc1309b43..42f25d241edd 100644
--- a/drivers/media/platform/rcar_fdp1.c
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -1596,7 +1596,7 @@ static int fdp1_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
else
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",
(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);
@@ -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);
- 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",
(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);
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] [media] v4l: rcar_fdp1: use %4.4s to format a 4-byte string
2016-12-26 13:31 [PATCH 1/1] [media] v4l: rcar_fdp1: use %4.4s to format a 4-byte string Nicolas Iooss
@ 2016-12-28 9:47 ` Kieran Bingham
0 siblings, 0 replies; 2+ messages in thread
From: Kieran Bingham @ 2016-12-28 9:47 UTC (permalink / raw)
To: Nicolas Iooss, linux-media, linux-renesas-soc; +Cc: linux-kernel
Hi Nicolas,
Thankyou for the patch
This looks like a good catch,
On 26/12/16 13:31, Nicolas Iooss wrote:
> 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: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Reviewed-by: Kieran Bingham <kieran@bingham.xyz>
> ---
> drivers/media/platform/rcar_fdp1.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
> index 674cc1309b43..42f25d241edd 100644
> --- a/drivers/media/platform/rcar_fdp1.c
> +++ b/drivers/media/platform/rcar_fdp1.c
> @@ -1596,7 +1596,7 @@ static int fdp1_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
> else
> 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",
> (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);
> @@ -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);
>
> - 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",
> (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);
>
--
Regards
Kieran Bingham
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-28 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26 13:31 [PATCH 1/1] [media] v4l: rcar_fdp1: use %4.4s to format a 4-byte string Nicolas Iooss
2016-12-28 9:47 ` Kieran Bingham
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).