Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] em28xx-v4l: fix device initialization in em28xx_v4l2_open() for radio and VBI mode

Browse Source 
- bail out on unsupported VFL_TYPE
- em28xx_set_mode() needs to be called for VBI and radio mode, too
- em28xx_wake_i2c() needs to be called for VBI and radio mode, too
- em28xx_resolution_set() also needs to be called for VBI

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2014-01-12 13:24:18 -03:00 committed by Mauro Carvalho Chehab
parent eab924d0e2
commit 4e1702402e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -1826,6 +1826,10 @@ static int em28xx_v4l2_open(struct file *filp)
case VFL_TYPE_VBI:
fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
break;
case VFL_TYPE_RADIO:
break;
default:
return -EINVAL;
}
em28xx_videodbg("open dev=%s type=%s users=%d\n",
@ -1846,15 +1850,17 @@ static int em28xx_v4l2_open(struct file *filp)
fh->type = fh_type;
filp->private_data = fh;
if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
if (dev->users == 0) {
em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
em28xx_resolution_set(dev);
/* Needed, since GPIO might have disabled power of
some i2c device
if (vdev->vfl_type != VFL_TYPE_RADIO)
em28xx_resolution_set(dev);
/*
* Needed, since GPIO might have disabled power
* of some i2c devices
*/
em28xx_wake_i2c(dev);
}
if (vdev->vfl_type == VFL_TYPE_RADIO) {