From eeb06518fab79db342689692dea633d2130a9d8d Mon Sep 17 00:00:00 2001
From: Robert Lowery <rglowery@exemail.com.au>
Date: Wed, 30 Jul 2008 19:43:11 -0300
Subject: [PATCH] --- yaml --- r: 107901 b: refs/heads/master c:
 d483b730681fa527f343dcc859185e06d60ae121 h: refs/heads/master i:   107899:
 d88ccdab097b261fa2bf072a3d89d0b312d8052b v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/dvb/dvb-usb/cxusb.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 08aaa50a2f74..dcdb998a111a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcf5cb2406827fc9d3f3fe260ac883ef72b8bac0
+refs/heads/master: d483b730681fa527f343dcc859185e06d60ae121
diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.c b/trunk/drivers/media/dvb/dvb-usb/cxusb.c
index 578afce6884c..aaa0b6f0b521 100644
--- a/trunk/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/trunk/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);