diff --git a/[refs] b/[refs] index 29cd572a445f..064d592bc5bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09c35440308138059e23a9a8e04f053094fb81a8 +refs/heads/master: 49faae869fb1647b8201859602e11bed18230702 diff --git a/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c b/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c index 48c62c997502..1ae0e8a4068c 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c +++ b/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c @@ -654,8 +654,8 @@ int medusa_set_brightness(struct cx25821_dev *dev, int brightness, int decoder) u32 val = 0, tmp = 0; mutex_lock(&dev->lock); - if ((brightness > VIDEO_PROCAMP_MAX) - || (brightness < VIDEO_PROCAMP_MIN)) { + if ((brightness > VIDEO_PROCAMP_MAX) || + (brightness < VIDEO_PROCAMP_MIN)) { mutex_unlock(&dev->lock); return -1; } @@ -743,8 +743,8 @@ int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder) mutex_lock(&dev->lock); - if ((saturation > VIDEO_PROCAMP_MAX) - || (saturation < VIDEO_PROCAMP_MIN)) { + if ((saturation > VIDEO_PROCAMP_MAX) || + (saturation < VIDEO_PROCAMP_MIN)) { mutex_unlock(&dev->lock); return -1; }