2 files changed, 31 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 48a975134ac5..a851a81e257e 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -463,6 +463,30 @@ static struct xc5000_config mygica_x8506_xc5000_config = {
         .if_khz = 5380,
 };
 
+static int cx23885_dvb_set_frontend(struct dvb_frontend *fe,
+                                    struct dvb_frontend_parameters *param)
+{
+        struct cx23885_tsport *port = fe->dvb->priv;
+        struct cx23885_dev *dev = port->dev;
+
+        switch (dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1275:
+                switch (param->u.vsb.modulation) {
+                case VSB_8:
+                        cx23885_gpio_clear(dev, GPIO_5);
+                        break;
+                case QAM_64:
+                case QAM_256:
+                default:
+                        cx23885_gpio_set(dev, GPIO_5);
+                        break;
+                }
+                break;
+        }
+        return (port->set_frontend_save) ?
+                port->set_frontend_save(fe, param) : -ENODEV;
+}
+
 static int dvb_register(struct cx23885_tsport *port)
 {
         struct cx23885_dev *dev = port->dev;
@@ -502,6 +526,11 @@ static int dvb_register(struct cx23885_tsport *port)
                                    0x60, &dev->i2c_bus[1].i2c_adap,
                                    &hauppauge_hvr127x_config);
                 }
+
+                /* define bridge override to set_frontend */
+                port->set_frontend_save = fe0->dvb.frontend->ops.set_frontend;
+                fe0->dvb.frontend->ops.set_frontend = cx23885_dvb_set_frontend;
+
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1255:
                 i2c_bus = &dev->i2c_bus[0];
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 1a2ac518a3f1..f4e22b0af7d2 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -288,6 +288,8 @@ struct cx23885_tsport {
         /* Allow a single tsport to have multiple frontends */
         u32                        num_frontends;
         void                       *port_priv;
+        int (*set_frontend_save) (struct dvb_frontend *,
+                                  struct dvb_frontend_parameters *);
 };
 
 struct cx23885_dev {