V4L/DVB (6881): include struct analog_demod_ops directly inside struct dvb_frontend

[linux-2.6] / drivers / media / video / tda9887.c

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 1b017d52bfb5f19d0642d3e4200a7106f8a89329..d3aabe2d146b3124c05c54bec0325b4c97c8d605 100644 (file)
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -648,7 +648,7 @@ static void tda9887_release(struct dvb_frontend *fe)
        fe->analog_demod_priv = NULL;
 }
 
-static struct analog_tuner_ops tda9887_tuner_ops = {
+static struct analog_demod_ops tda9887_ops = {
        .info           = {
                .name   = "TDA9887",
        },
@@ -677,7 +677,8 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
 
        tuner_info("tda988[5/6/7] found\n");
 
-       fe->ops.analog_demod_ops = &tda9887_tuner_ops;
+       memcpy(&fe->ops.analog_ops, &tda9887_ops,
+              sizeof(struct analog_demod_ops));
 
        return fe;
 }