aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-jpeg
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2013-10-10 03:45:56 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-12-18 03:08:52 -0500
commitbaaf046d8297cb1c777374341953833750a73131 (patch)
tree7206d6a019766c5bcdbdf8e5e4af4bf6af80feb8 /drivers/media/platform/s5p-jpeg
parent675722b0e3917c6c917f1aa5f6d005cd3a0479f5 (diff)
[media] s5p-jpeg: Fix encoder and decoder video dev names
It is hard to distinguish between decoder and encoder video device because their names are same. So this patch fixes the names. Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-jpeg')
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index c818cbe6dd5d..091b06af84ea 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1301,8 +1301,8 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
1301 ret = -ENOMEM; 1301 ret = -ENOMEM;
1302 goto vb2_allocator_rollback; 1302 goto vb2_allocator_rollback;
1303 } 1303 }
1304 strlcpy(jpeg->vfd_encoder->name, S5P_JPEG_M2M_NAME, 1304 snprintf(jpeg->vfd_encoder->name, sizeof(jpeg->vfd_encoder->name),
1305 sizeof(jpeg->vfd_encoder->name)); 1305 "%s-enc", S5P_JPEG_M2M_NAME);
1306 jpeg->vfd_encoder->fops = &s5p_jpeg_fops; 1306 jpeg->vfd_encoder->fops = &s5p_jpeg_fops;
1307 jpeg->vfd_encoder->ioctl_ops = &s5p_jpeg_ioctl_ops; 1307 jpeg->vfd_encoder->ioctl_ops = &s5p_jpeg_ioctl_ops;
1308 jpeg->vfd_encoder->minor = -1; 1308 jpeg->vfd_encoder->minor = -1;
@@ -1329,8 +1329,8 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
1329 ret = -ENOMEM; 1329 ret = -ENOMEM;
1330 goto enc_vdev_register_rollback; 1330 goto enc_vdev_register_rollback;
1331 } 1331 }
1332 strlcpy(jpeg->vfd_decoder->name, S5P_JPEG_M2M_NAME, 1332 snprintf(jpeg->vfd_decoder->name, sizeof(jpeg->vfd_decoder->name),
1333 sizeof(jpeg->vfd_decoder->name)); 1333 "%s-dec", S5P_JPEG_M2M_NAME);
1334 jpeg->vfd_decoder->fops = &s5p_jpeg_fops; 1334 jpeg->vfd_decoder->fops = &s5p_jpeg_fops;
1335 jpeg->vfd_decoder->ioctl_ops = &s5p_jpeg_ioctl_ops; 1335 jpeg->vfd_decoder->ioctl_ops = &s5p_jpeg_ioctl_ops;
1336 jpeg->vfd_decoder->minor = -1; 1336 jpeg->vfd_decoder->minor = -1;