Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Patrick Boettcher and committed by Linus Torvalds 363bbf42 ded92846
+9
-9
drivers/media/dvb/dvb-usb/dibusb-common.c
+9
-9
drivers/media/dvb/dvb-usb/dibusb-common.c
···
21
21
int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
22
22
{
23
23
if (d->priv != NULL) {
24
-
struct dib_fe_xfer_ops *ops = d->priv;
25
-
if (ops->fifo_ctrl != NULL)
26
-
if (ops->fifo_ctrl(d->fe,onoff)) {
24
+
struct dibusb_state *st = d->priv;
25
+
if (st->ops.fifo_ctrl != NULL)
26
+
if (st->ops.fifo_ctrl(d->fe,onoff)) {
27
27
err("error while controlling the fifo of the demod.");
28
28
return -ENODEV;
29
29
}
···
35
35
int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
36
36
{
37
37
if (d->priv != NULL) {
38
-
struct dib_fe_xfer_ops *ops = d->priv;
39
-
if (d->pid_filtering && ops->pid_ctrl != NULL)
40
-
ops->pid_ctrl(d->fe,index,pid,onoff);
38
+
struct dibusb_state *st = d->priv;
39
+
if (st->ops.pid_ctrl != NULL)
40
+
st->ops.pid_ctrl(d->fe,index,pid,onoff);
41
41
}
42
42
return 0;
43
43
}
···
46
46
int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
47
47
{
48
48
if (d->priv != NULL) {
49
-
struct dib_fe_xfer_ops *ops = d->priv;
50
-
if (ops->pid_parse != NULL)
51
-
if (ops->pid_parse(d->fe,onoff) < 0)
49
+
struct dibusb_state *st = d->priv;
50
+
if (st->ops.pid_parse != NULL)
51
+
if (st->ops.pid_parse(d->fe,onoff) < 0)
52
52
err("could not handle pid_parser");
53
53
}
54
54
return 0;