Merge branch 'staging/for_v3.7' into v4l_for_linus

Applied on the top of changeset 782cd9e, as some of those patches
depend on some fixes that went via -arm tree.

* staging/for_v3.7: (109 commits)
  [media] m5mols: Add missing #include <linux/sizes.h>
  [media] stk1160: Add support for S-Video input
  Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
  [media]  dvb: LNA implementation changes
  [media] v4l2-ioctl: fix W=1 warnings
  [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
  [media] omap3isp: Fix compilation error in ispreg.h
  [media] rc-msi-digivox-ii: Add full scan keycodes
  [media] cx25821: testing the wrong variable
  [media] tda18271-common: hold the I2C adapter during write transfers
  [media] ds3000: add module parameter to force firmware upload
  [media] drivers/media: Remove unnecessary semicolon
  [media] winbond: remove space from driver name
  [media] iguanair: cannot send data from the stack
  [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
  [media] dvb-usb: print small buffers via %*ph
  [media] uvc: Add return code check at vb2_queue_init()
  [media] em28xx: Replace memcpy with struct assignment
  [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
  [media] mem2mem_testdev: Use devm_kzalloc() in probe
  ...

2 files changed, 18 insertions, 6 deletions

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 8f58f241c10d..7e92793260f0 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -966,6 +966,8 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
                 break;
         }
 
+        c->lna = LNA_AUTO;
+
         return 0;
 }
 
@@ -1054,6 +1056,8 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
         _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_B, 0, 0),
         _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_C, 0, 0),
         _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_D, 0, 0),
+
+        _DTV_CMD(DTV_LNA, 0, 0),
 };
 
 static void dtv_property_dump(struct dvb_frontend *fe, struct dtv_property *tvp)
@@ -1440,6 +1444,10 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
                 tvp->u.data = fe->dtv_property_cache.atscmh_sccc_code_mode_d;
                 break;
 
+        case DTV_LNA:
+                tvp->u.data = c->lna;
+                break;
+
         default:
                 return -EINVAL;
         }
@@ -1731,10 +1739,6 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
         case DTV_INTERLEAVING:
                 c->interleaving = tvp->u.data;
                 break;
-        case DTV_LNA:
-                if (fe->ops.set_lna)
-                        r = fe->ops.set_lna(fe, tvp->u.data);
-                break;
 
         /* ISDB-T Support here */
         case DTV_ISDBT_PARTIAL_RECEPTION:
@@ -1806,6 +1810,12 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
                 fe->dtv_property_cache.atscmh_rs_frame_ensemble = tvp->u.data;
                 break;
 
+        case DTV_LNA:
+                c->lna = tvp->u.data;
+                if (fe->ops.set_lna)
+                        r = fe->ops.set_lna(fe);
+                break;
+
         default:
                 return -EINVAL;
         }
@@ -2309,7 +2319,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                 fepriv->tune_mode_flags = (unsigned long) parg;
                 err = 0;
                 break;
-        };
+        }
 
         return err;
 }
diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
index 44a445cee74f..97112cd88a17 100644
--- a/drivers/media/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
@@ -303,7 +303,7 @@ struct dvb_frontend_ops {
         int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
         int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
         int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
-        int (*set_lna)(struct dvb_frontend *, int);
+        int (*set_lna)(struct dvb_frontend *);
 
         /* These callbacks are for devices that implement their own
          * tuning algorithms, rather than a simple swzigzag
@@ -391,6 +391,8 @@ struct dtv_frontend_properties {
         u8                      atscmh_sccc_code_mode_b;
         u8                      atscmh_sccc_code_mode_c;
         u8                      atscmh_sccc_code_mode_d;
+
+        u32                     lna;
 };
 
 struct dvb_frontend {