git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
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
9999336
..
8452eef
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 vp7045_fe_state {
struct dvb_frontend fe;
- struct dvb_frontend_ops ops;
-
struct dvb_usb_device *d;
};
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;
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;
s->fe.demodulator_priv = s;
-
goto success
;
+
return &s->fe
;
error:
return NULL;
error:
return NULL;
-success:
- return &s->fe;
}
}