[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>

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 00b946419b408fb1128bd52088f2d5fd034f4811..269d899da488336024e70286a8773b48cff65c77 100644 (file)
--- 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");
 int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
 {
        if (d->priv != NULL) {
-               struct dib_fe_xfer_ops *ops = d->priv;
-               if (ops->fifo_ctrl != NULL)
-                       if (ops->fifo_ctrl(d->fe,onoff)) {
+               struct dibusb_state *st = d->priv;
+               if (st->ops.fifo_ctrl != NULL)
+                       if (st->ops.fifo_ctrl(d->fe,onoff)) {
                                err("error while controlling the fifo of the demod.");
                                return -ENODEV;
                        }
@@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl);
 int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
 {
        if (d->priv != NULL) {
-               struct dib_fe_xfer_ops *ops = d->priv;
-               if (d->pid_filtering && ops->pid_ctrl != NULL)
-                       ops->pid_ctrl(d->fe,index,pid,onoff);
+               struct dibusb_state *st = d->priv;
+               if (st->ops.pid_ctrl != NULL)
+                       st->ops.pid_ctrl(d->fe,index,pid,onoff);
        }
        return 0;
 }
@@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter);
 int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
 {
        if (d->priv != NULL) {
-               struct dib_fe_xfer_ops *ops = d->priv;
-               if (ops->pid_parse != NULL)
-                       if (ops->pid_parse(d->fe,onoff) < 0)
+               struct dibusb_state *st = d->priv;
+               if (st->ops.pid_parse != NULL)
+                       if (st->ops.pid_parse(d->fe,onoff) < 0)
                                err("could not handle pid_parser");
        }
        return 0;