Skip to content

Commit

Permalink
V4L/DVB (9931): em28xx: de-obfuscate vidioc_g_ctrl logic
Browse files Browse the repository at this point in the history
vidioc_g_ctrl() were using an uneeded confusing logic. Instead, use the
direct approach.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 5db0b5e commit b6070f0
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/media/video/em28xx/em28xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b6070f0

Please sign in to comment.