diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 09:13:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 09:13:13 -0300 |
| commit | e4cef520f1dbf94bf4d95b570b61639089fc24ff (patch) | |
| tree | 8313dbded98f618cde7ea582bb5119f2bd4b6028 /linux/drivers/media | |
| parent | 3d97516e337a4c1b0e057e3c8eb1d771878a5343 (diff) | |
| parent | b8e0b401a66a9c16cbf82b5b6ded4f43f3049ad5 (diff) | |
| download | mediapointer-dvb-s2-e4cef520f1dbf94bf4d95b570b61639089fc24ff.tar.gz mediapointer-dvb-s2-e4cef520f1dbf94bf4d95b570b61639089fc24ff.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/cxusb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c index 578afce68..aaa0b6f0b 100644 --- a/linux/drivers/media/dvb/dvb-usb/cxusb.c +++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c @@ -565,7 +565,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap) static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg) { - struct dvb_usb_device *d = ptr; + struct dvb_usb_adapter *adap = ptr; + struct dvb_usb_device *d = adap->dev; switch (command) { case XC2028_TUNER_RESET: @@ -593,9 +594,9 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap) .callback = dvico_bluebird_xc2028_callback, }; static struct xc2028_ctrl ctl = { - .fname = "xc3028-dvico-au-01.fw", + .fname = "xc3028-v27.fw", .max_len = 64, - .scode_table = XC3028_FE_ZARLINK456, + .demod = XC3028_FE_ZARLINK456, }; fe = dvb_attach(xc2028_attach, adap->fe, &cfg); |