diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-10-27 11:00:19 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-10-27 11:00:19 -0700 |
commit | 728d90bdc9e480dc93913e59a0aa3c896c7aa697 (patch) | |
tree | 258b1b6ee711f0ef67fd225700d84eccec285194 /drivers/media/pci/cx23885/cx23885-417.c | |
parent | Input: adp5589 - make keypad support optional (diff) | |
parent | Linux 5.4-rc5 (diff) | |
download | linux-dev-728d90bdc9e480dc93913e59a0aa3c896c7aa697.tar.xz linux-dev-728d90bdc9e480dc93913e59a0aa3c896c7aa697.zip |
Merge tag 'v5.4-rc5' into next
Sync up with mainline.
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-417.c')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-417.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 82f96a4091ac..2327fe612610 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c @@ -1339,7 +1339,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, if (f->index != 0) return -EINVAL; - strscpy(f->description, "MPEG", sizeof(f->description)); f->pixelformat = V4L2_PIX_FMT_MPEG; return 0; |