Commit 363bbf42 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Linus Torvalds

[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: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ded92846
...@@ -21,9 +21,9 @@ MODULE_LICENSE("GPL"); ...@@ -21,9 +21,9 @@ MODULE_LICENSE("GPL");
int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
{ {
if (d->priv != NULL) { if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv; struct dibusb_state *st = d->priv;
if (ops->fifo_ctrl != NULL) if (st->ops.fifo_ctrl != NULL)
if (ops->fifo_ctrl(d->fe,onoff)) { if (st->ops.fifo_ctrl(d->fe,onoff)) {
err("error while controlling the fifo of the demod."); err("error while controlling the fifo of the demod.");
return -ENODEV; return -ENODEV;
} }
...@@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl); ...@@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl);
int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
{ {
if (d->priv != NULL) { if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv; struct dibusb_state *st = d->priv;
if (d->pid_filtering && ops->pid_ctrl != NULL) if (st->ops.pid_ctrl != NULL)
ops->pid_ctrl(d->fe,index,pid,onoff); st->ops.pid_ctrl(d->fe,index,pid,onoff);
} }
return 0; return 0;
} }
...@@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter); ...@@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter);
int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
{ {
if (d->priv != NULL) { if (d->priv != NULL) {
struct dib_fe_xfer_ops *ops = d->priv; struct dibusb_state *st = d->priv;
if (ops->pid_parse != NULL) if (st->ops.pid_parse != NULL)
if (ops->pid_parse(d->fe,onoff) < 0) if (st->ops.pid_parse(d->fe,onoff) < 0)
err("could not handle pid_parser"); err("could not handle pid_parser");
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment