Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / drivers / media / dvb / dvb-usb / vp7045-fe.c

diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 9999336aeeb6797aaa0a6c8be91d3fbde1aafe9d..8452eef90322be8d97e9a08c81881cc47f6cf311 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -23,8 +23,6 @@
 
 struct vp7045_fe_state {
        struct dvb_frontend fe;
-       struct dvb_frontend_ops ops;
-
        struct dvb_usb_device *d;
 };
 
@@ -151,15 +149,12 @@ struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
                goto error;
 
        s->d = d;
-       memcpy(&s->ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops));
-       s->fe.ops = &s->ops;
+       memcpy(&s->fe.ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops));
        s->fe.demodulator_priv = s;
 
-       goto success;
+       return &s->fe;
 error:
        return NULL;
-success:
-       return &s->fe;
 }