[PATCH 4/6] [media] s5p-jpeg: only fill driver's name in capabilities driver field
Shuah Khan
shuahkh at osg.samsung.com
Wed Jun 29 12:47:17 PDT 2016
On 06/16/2016 03:40 PM, Javier Martinez Canillas wrote:
> The driver fills in both the struct v4l2_capability driver and card fields
> the same values, that is the driver's name plus the information if the dev
> is a decoder or an encoder.
>
> But the driver field has a fixed length of 16 bytes so the filled data is
> truncated:
>
> Driver Info (not using libv4l2):
> Driver name : s5p-jpeg decode
> Card type : s5p-jpeg decoder
> Bus info : platform:11f50000.jpeg
> Driver version: 4.7.0
>
> Also, this field should only contain the driver's name so use just that.
> The information if the device is a decoder or an encoder is in the card
> type field anyways.
>
> Signed-off-by: Javier Martinez Canillas <javier at osg.samsung.com>
> ---
>
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index e3ff3d4bd72e..f9fb52a53e79 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -1246,12 +1246,12 @@ static int s5p_jpeg_querycap(struct file *file, void *priv,
> struct s5p_jpeg_ctx *ctx = fh_to_ctx(priv);
>
> if (ctx->mode == S5P_JPEG_ENCODE) {
> - strlcpy(cap->driver, S5P_JPEG_M2M_NAME " encoder",
> + strlcpy(cap->driver, S5P_JPEG_M2M_NAME,
> sizeof(cap->driver));
> strlcpy(cap->card, S5P_JPEG_M2M_NAME " encoder",
> sizeof(cap->card));
> } else {
> - strlcpy(cap->driver, S5P_JPEG_M2M_NAME " decoder",
> + strlcpy(cap->driver, S5P_JPEG_M2M_NAME,
> sizeof(cap->driver));
> strlcpy(cap->card, S5P_JPEG_M2M_NAME " decoder",
> sizeof(cap->card));
>
Looks good.
Reviewed-by: Shuah Khan <shuahkh at osg.samsung.com>
-- Shuah
More information about the linux-arm-kernel
mailing list