1 files changed, 13 insertions, 14 deletions

diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 46e12a8acf7..1ef82182564 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -39,7 +39,6 @@
 
 struct mt312_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct mt312_config* config;
         struct dvb_frontend frontend;
@@ -471,16 +470,16 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
 
         dprintk("%s: Freq %d\n", __FUNCTION__, p->frequency);
 
-        if ((p->frequency < fe->ops->info.frequency_min)
-            || (p->frequency > fe->ops->info.frequency_max))
+        if ((p->frequency < fe->ops.info.frequency_min)
+            || (p->frequency > fe->ops.info.frequency_max))
                 return -EINVAL;
 
         if ((p->inversion < INVERSION_OFF)
             || (p->inversion > INVERSION_ON))
                 return -EINVAL;
 
-        if ((p->u.qpsk.symbol_rate < fe->ops->info.symbol_rate_min)
-            || (p->u.qpsk.symbol_rate > fe->ops->info.symbol_rate_max))
+        if ((p->u.qpsk.symbol_rate < fe->ops.info.symbol_rate_min)
+            || (p->u.qpsk.symbol_rate > fe->ops.info.symbol_rate_max))
                 return -EINVAL;
 
         if ((p->u.qpsk.fec_inner < FEC_NONE)
@@ -523,9 +522,9 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
                 return -EINVAL;
         }
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* sr = (u16)(sr * 256.0 / 1000000.0) */
@@ -670,19 +669,22 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (mt312_readreg(state, ID, &state->id) < 0)
                 goto error;
 
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+
         switch (state->id) {
         case ID_VP310:
-                strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
+                strcpy(state->frontend.ops.info.name, "Zarlink VP310 DVB-S");
                 state->frequency = 90;
                 break;
         case ID_MT312:
-                strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
+                strcpy(state->frontend.ops.info.name, "Zarlink MT312 DVB-S");
                 state->frequency = 60;
                 break;
         default:
@@ -690,9 +692,6 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
                 goto error;
         }
 
-        /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
         return &state->frontend;
 
 error: