Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e170240 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

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



- 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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent eab924d0

drivers/media/usb/em28xx/em28xx-video.c

+11 −5
Original line number Diff line number Diff line
@@ -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);



		if (vdev->vfl_type != VFL_TYPE_RADIO)

			em28xx_resolution_set(dev);



		/* Needed, since GPIO might have disabled power of

		   some i2c device

		/*

		 * Needed, since GPIO might have disabled power

		 * of some i2c devices

		 */

		em28xx_wake_i2c(dev);



	}



	if (vdev->vfl_type == VFL_TYPE_RADIO) {