media: media/usb: don't set description in ENUM_FMT
The V4L2 core sets the description for the driver in order to ensure consistent naming. So drop the strscpy of the description in drivers. Also remove any description strings in driver-internal structures since those are no longer needed. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
此提交包含在:
@@ -285,33 +285,22 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_fmtdesc *fmt)
|
||||
{
|
||||
char *desc = NULL;
|
||||
|
||||
switch (fmt->index) {
|
||||
case 0:
|
||||
fmt->pixelformat = V4L2_PIX_FMT_MJPEG;
|
||||
desc = "Motion JPEG";
|
||||
break;
|
||||
case 1:
|
||||
fmt->pixelformat = V4L2_PIX_FMT_MPEG1;
|
||||
desc = "MPEG-1 ES";
|
||||
break;
|
||||
case 2:
|
||||
fmt->pixelformat = V4L2_PIX_FMT_MPEG2;
|
||||
desc = "MPEG-2 ES";
|
||||
break;
|
||||
case 3:
|
||||
fmt->pixelformat = V4L2_PIX_FMT_MPEG4;
|
||||
desc = "MPEG-4 ES";
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
fmt->flags = V4L2_FMT_FLAG_COMPRESSED;
|
||||
|
||||
strscpy(fmt->description, desc, sizeof(fmt->description));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
新增問題並參考
封鎖使用者