diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2005-12-01 03:51:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:48:59 -0500 |
| commit | 363bbf42da23898ab48dc227cca9d80b50b481eb (patch) | |
| tree | ee6463de2fb4caa70924ed3dd33015df4f266060 | |
| parent | ded928468407c8e08dcb6aedb91aaa97b80d5752 (diff) | |
[PATCH] DVB: Fixed incorrect usage at the private state of the dvb-usb-devices
Fixed mistake of an incorrect usage of pid_filter-callbacks inside the private
state of the dvb-usb-devices
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-common.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c index 00b946419b40..269d899da488 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/drivers/media/dvb/dvb-usb/dibusb-common.c | |||
| @@ -21,9 +21,9 @@ MODULE_LICENSE("GPL"); | |||
| 21 | int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) | 21 | int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) |
| 22 | { | 22 | { |
| 23 | if (d->priv != NULL) { | 23 | if (d->priv != NULL) { |
| 24 | struct dib_fe_xfer_ops *ops = d->priv; | 24 | struct dibusb_state *st = d->priv; |
| 25 | if (ops->fifo_ctrl != NULL) | 25 | if (st->ops.fifo_ctrl != NULL) |
| 26 | if (ops->fifo_ctrl(d->fe,onoff)) { | 26 | if (st->ops.fifo_ctrl(d->fe,onoff)) { |
| 27 | err("error while controlling the fifo of the demod."); | 27 | err("error while controlling the fifo of the demod."); |
| 28 | return -ENODEV; | 28 | return -ENODEV; |
| 29 | } | 29 | } |
| @@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl); | |||
| 35 | int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) | 35 | int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) |
| 36 | { | 36 | { |
| 37 | if (d->priv != NULL) { | 37 | if (d->priv != NULL) { |
| 38 | struct dib_fe_xfer_ops *ops = d->priv; | 38 | struct dibusb_state *st = d->priv; |
| 39 | if (d->pid_filtering && ops->pid_ctrl != NULL) | 39 | if (st->ops.pid_ctrl != NULL) |
| 40 | ops->pid_ctrl(d->fe,index,pid,onoff); | 40 | st->ops.pid_ctrl(d->fe,index,pid,onoff); |
| 41 | } | 41 | } |
| 42 | return 0; | 42 | return 0; |
| 43 | } | 43 | } |
| @@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter); | |||
| 46 | int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) | 46 | int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) |
| 47 | { | 47 | { |
| 48 | if (d->priv != NULL) { | 48 | if (d->priv != NULL) { |
| 49 | struct dib_fe_xfer_ops *ops = d->priv; | 49 | struct dibusb_state *st = d->priv; |
| 50 | if (ops->pid_parse != NULL) | 50 | if (st->ops.pid_parse != NULL) |
| 51 | if (ops->pid_parse(d->fe,onoff) < 0) | 51 | if (st->ops.pid_parse(d->fe,onoff) < 0) |
| 52 | err("could not handle pid_parser"); | 52 | err("could not handle pid_parser"); |
| 53 | } | 53 | } |
| 54 | return 0; | 54 | return 0; |
