leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] dvb_usb_v2: move fe_ioctl_override() callback

Browse Source 
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-06-15 02:10:50 -03:00 committed by Mauro Carvalho Chehab
parent d70521a396
commit 6dca4ea3ec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/dvb/dvb-usb/dvb_usb.h
View File

@ -100,9 +100,6 @@ struct dvb_usb_adapter_properties {
int (*pid_filter_ctrl) (struct dvb_usb_adapter *, int);
int (*pid_filter) (struct dvb_usb_adapter *, int, u16, int);
int (*fe_ioctl_override) (struct dvb_frontend *,
unsigned int, void *, unsigned int);
struct usb_data_stream_properties stream;
};
@ -189,6 +186,8 @@ struct dvb_usb_device_properties {
int (*tuner_attach) (struct dvb_usb_adapter *);
int (*frontend_ctrl) (struct dvb_frontend *, int);
int (*streaming_ctrl) (struct dvb_usb_adapter *, int);
int (*fe_ioctl_override) (struct dvb_frontend *,
unsigned int, void *, unsigned int);
#define WARM 0
#define COLD 1

1
drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
View File

@ -204,7 +204,6 @@ int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap)
goto err;
}
adap->dvb_adap.priv = adap;
adap->dvb_adap.fe_ioctl_override = adap->props->fe_ioctl_override;
if (adap->dev->props->read_mac_address) {
if (adap->dev->props->read_mac_address(adap->dev,

2
drivers/media/dvb/dvb-usb/dvb_usb_init.c
View File

@ -279,6 +279,8 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
if (adap->fe[1])
adap->dvb_adap.mfe_shared = 1;
adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override;
d->num_adapters_initialized++;
}