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

Commit b6070f07 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (9931): em28xx: de-obfuscate vidioc_g_ctrl logic 



vidioc_g_ctrl() were using an uneeded confusing logic. Instead, use the
direct approach.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5db0b5e1

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

+4 −8
Original line number Diff line number Diff line
@@ -1057,18 +1057,14 @@ static int vidioc_g_ctrl(struct file *file, void *priv, 
	rc = check_dev(dev);

	if (rc < 0)

		return rc;

	rc = 0;



	mutex_lock(&dev->lock);



	if (!dev->board.has_msp34xx)

		rc = em28xx_get_ctrl(dev, ctrl);

	else

		rc = -EINVAL;



	if (rc == -EINVAL) {

	if (dev->board.has_msp34xx)

		em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);

		rc = 0;

	}

	else

		rc = em28xx_get_ctrl(dev, ctrl);



	mutex_unlock(&dev->lock);

	return rc;