Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (26 commits)
  V4L/DVB (6548): pvrusb2: Fix oops on module removal
  V4L/DVB (6547): V4L: remove PCI from VIDEO_VIVI depends
  V4L/DVB (6532): Add the remaining addresses for tda9887
  V4L/DVB (6531): Fix a regression caused by commit 153962364dc6fa4a24571885fbe76506d8968610
  V4L/DVB (6518): Fix tvp5150 default values
  V4L/DVB (6514): em28xx: Include linux/mm.h
  V4L/DVB (6506): saa7134-alsa: Fix mmap support
  V4L/DVB (6504): pvrusb2: Remove dead sysfs code
  V4L/DVB (6503): pvrusb2: Fix associativity logic error
  V4L/DVB (6501): stv0297: Signal strength fixes
  V4L/DVB (6500): tda10021: Fix reported signal strength
  V4L/DVB (6499): tda10021: Bit error counting fixed
  V4L/DVB (6498): ves1820: Change the acquisition range for clock recovery from 120 ppm to 240ppm
  V4L/DVB (6495): saa7146: saa7146_wait_for_debi_done fixes
  V4L/DVB (6479): use input functions, should depend on INPUT
  V4L/DVB (6478): ir-functions use input functions, should depend on INPUT
  V4L/DVB (6432): tuner: fix CONFIG_TUNER_TEA5761=m
  V4L/DVB (6407): planb: fix obvious interrupt handling bugs
  V4L/DVB (6406): saa7134: fix analog audio in on medion md8800 quadro
  V4L/DVB (6403): mt2131: replace comma with semicolon fix
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index e2f1c972754b..25d0aef88ef5 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -799,10 +799,10 @@ static inline void tvp5150_reset(struct i2c_client *c)
         tvp5150_write_inittab(c, tvp5150_init_enable);
 
         /* Initialize image preferences */
-        tvp5150_write(c, TVP5150_BRIGHT_CTL, decoder->bright >> 8);
-        tvp5150_write(c, TVP5150_CONTRAST_CTL, decoder->contrast >> 8);
-        tvp5150_write(c, TVP5150_SATURATION_CTL, decoder->contrast >> 8);
-        tvp5150_write(c, TVP5150_HUE_CTL, (decoder->hue - 32768) >> 8);
+        tvp5150_write(c, TVP5150_BRIGHT_CTL, decoder->bright);
+        tvp5150_write(c, TVP5150_CONTRAST_CTL, decoder->contrast);
+        tvp5150_write(c, TVP5150_SATURATION_CTL, decoder->contrast);
+        tvp5150_write(c, TVP5150_HUE_CTL, decoder->hue);
 
         tvp5150_set_std(c, decoder->norm);
 };
@@ -1077,10 +1077,10 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
         core->norm = V4L2_STD_ALL;      /* Default is autodetect */
         core->route.input = TVP5150_COMPOSITE1;
         core->enable = 1;
-        core->bright = 32768;
-        core->contrast = 32768;
-        core->hue = 32768;
-        core->sat = 32768;
+        core->bright = 128;
+        core->contrast = 128;
+        core->hue = 0;
+        core->sat = 128;
 
         if (rv) {
                 kfree(c);