diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045-fe.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045-fe.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c index 9999336aeeb6..8452eef90322 100644 --- a/drivers/media/dvb/dvb-usb/vp7045-fe.c +++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | struct vp7045_fe_state { | 24 | struct vp7045_fe_state { |
25 | struct dvb_frontend fe; | 25 | struct dvb_frontend fe; |
26 | struct dvb_frontend_ops ops; | ||
27 | |||
28 | struct dvb_usb_device *d; | 26 | struct dvb_usb_device *d; |
29 | }; | 27 | }; |
30 | 28 | ||
@@ -151,15 +149,12 @@ struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d) | |||
151 | goto error; | 149 | goto error; |
152 | 150 | ||
153 | s->d = d; | 151 | s->d = d; |
154 | memcpy(&s->ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops)); | 152 | memcpy(&s->fe.ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops)); |
155 | s->fe.ops = &s->ops; | ||
156 | s->fe.demodulator_priv = s; | 153 | s->fe.demodulator_priv = s; |
157 | 154 | ||
158 | goto success; | 155 | return &s->fe; |
159 | error: | 156 | error: |
160 | return NULL; | 157 | return NULL; |
161 | success: | ||
162 | return &s->fe; | ||
163 | } | 158 | } |
164 | 159 | ||
165 | 160 | ||