From d61779284e3f94ff114bc174ef1739879ee10945 Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:15:01 +0800 Subject: [PATCH] --- yaml --- r: 268452 b: refs/heads/master c: 8a911ed9c0eb73530b823a55756cd39763824867 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.c | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index f03a49d2cd76..ef203a8717ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0b871bd2c8f6760c75cc72d960533b1928f16ab +refs/heads/master: 8a911ed9c0eb73530b823a55756cd39763824867 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index 8cda0f9380ee..d3c387015d7d 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -1580,19 +1580,19 @@ int cx25821_set_control(struct cx25821_dev *dev, switch (ctl->id) { case V4L2_CID_BRIGHTNESS: - dev->channels[chan_num].ctl_bright = ctl->value; + dev->channels[chan_num].ctl_bright = ctl->value; medusa_set_brightness(dev, ctl->value, chan_num); break; case V4L2_CID_HUE: - dev->channels[chan_num].ctl_hue = ctl->value; + dev->channels[chan_num].ctl_hue = ctl->value; medusa_set_hue(dev, ctl->value, chan_num); break; case V4L2_CID_CONTRAST: - dev->channels[chan_num].ctl_contrast = ctl->value; + dev->channels[chan_num].ctl_contrast = ctl->value; medusa_set_contrast(dev, ctl->value, chan_num); break; case V4L2_CID_SATURATION: - dev->channels[chan_num].ctl_saturation = ctl->value; + dev->channels[chan_num].ctl_saturation = ctl->value; medusa_set_saturation(dev, ctl->value, chan_num); break; } @@ -1625,9 +1625,9 @@ int cx25821_vidioc_cropcap(struct file *file, void *priv, cropcap->bounds.width = 720; cropcap->bounds.height = dev->tvnorm == V4L2_STD_PAL_BG ? 576 : 480; cropcap->pixelaspect.numerator = - dev->tvnorm == V4L2_STD_PAL_BG ? 59 : 10; + dev->tvnorm == V4L2_STD_PAL_BG ? 59 : 10; cropcap->pixelaspect.denominator = - dev->tvnorm == V4L2_STD_PAL_BG ? 54 : 11; + dev->tvnorm == V4L2_STD_PAL_BG ? 54 : 11; cropcap->defrect = cropcap->bounds; return 0; } @@ -1639,24 +1639,24 @@ int cx25821_vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop) int err; if (fh) { - err = v4l2_prio_check(&dev->channels[fh->channel_id]. - prio, fh->prio); + err = v4l2_prio_check(&dev->channels[fh->channel_id].prio, + fh->prio); if (0 != err) return err; } - /* cx25821_vidioc_s_crop not supported */ + /* cx25821_vidioc_s_crop not supported */ return -EINVAL; } int cx25821_vidioc_g_crop(struct file *file, void *priv, struct v4l2_crop *crop) { - /* cx25821_vidioc_g_crop not supported */ + /* cx25821_vidioc_g_crop not supported */ return -EINVAL; } int cx25821_vidioc_querystd(struct file *file, void *priv, v4l2_std_id * norm) { - /* medusa does not support video standard sensing of current input */ + /* medusa does not support video standard sensing of current input */ *norm = CX25821_NORMS; return 0;