Merge branch 'devel-for-v3.10' into v4l_for_linus

* patchwork: (831 commits)
  [media] cx88: make core less verbose
  [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
  [media] s5c73m3: fix indentation of the help section in Kconfig
  [media] cx25821-alsa: get rid of a __must_check warning
  [media] cx25821-video: declare cx25821_vidioc_s_std as static
  [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
  [media] r820t: Remove a warning for an unused value
  [media] dib0090: Fix a warning at dib0090_set_EFUSE
  [media] dib8000: fix a warning
  [media] dib8000: Fix sub-channel range
  [media] dib8000: store dtv_property_cache in a temp var
  [media] dib8000: warning fix: declare internal functions as static
  [media] r820t: quiet gcc warning on n_ring
  [media] r820t: memory leak in release()
  [media] r820t: precendence bug in r820t_xtal_check()
  [media] videodev2.h: Remove the unused old V4L1 buffer types
  [media] anysee: Grammar s/report the/report to/
  [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
  [media] media: videobuf2: fix the length check for mmap
  [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
  ...

Conflicts:
	drivers/media/pci/cx25821/cx25821-video.c
	drivers/media/platform/Kconfig

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 672b267a2d3e..053ed1ba1d85 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -1042,7 +1042,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
@@ -1279,8 +1279,16 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &hauppauge_novas_config,
                                                &core->i2c_adap);
                 if (fe0->dvb.frontend) {
+                        bool override_tone;
+
+                        if (core->model == 92001)
+                                override_tone = true;
+                        else
+                                override_tone = false;
+
                         if (!dvb_attach(isl6421_attach, fe0->dvb.frontend,
-                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00))
+                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00,
+                                        override_tone))
                                 goto frontend_detach;
                 }
                 break;
@@ -1403,7 +1411,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
@@ -1431,7 +1439,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 break;