---

yaml --- r: 114007 b: refs/heads/master c: 767f3b3 h: refs/heads/master i: 114005: c1176cc 114003: f0bd3b6 113999: a7f1135 v: v3
git-mirror · Oct 12, 2008 · a1a4e81 · a1a4e81
1 parent e5d5edc
commit a1a4e81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7cba043d7ec840d67bd5143779d1febe7d83407
+refs/heads/master: 767f3b3bf23244d52be0492df20b0eaf14f501c5
diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c b/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1176,7 +1176,8 @@ static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap)
 	return adap->fe == NULL ? -ENODEV : 0;
 }
 
-int dib0700_xc5000_tuner_callback(void *priv, int command, int arg)
+static int dib0700_xc5000_tuner_callback(void *priv, int component,
+					 int command, int arg)
 {
 	struct dvb_usb_adapter *adap = priv;
 
@@ -1192,14 +1193,16 @@ int dib0700_xc5000_tuner_callback(void *priv, int command, int arg)
 static struct xc5000_config s5h1411_xc5000_tunerconfig = {
 	.i2c_address      = 0x64,
 	.if_khz           = 5380,
-	.tuner_callback   = dib0700_xc5000_tuner_callback
 };
 
 static int xc5000_tuner_attach(struct dvb_usb_adapter *adap)
 {
 	return dvb_attach(xc5000_attach, adap->fe, &adap->dev->i2c_adap,
-			  &s5h1411_xc5000_tunerconfig, adap)
+			  &s5h1411_xc5000_tunerconfig)
 		== NULL ? -ENODEV : 0;
+
+	/* FIXME: generalize & move to common area */
+	adap->fe->callback = dib0700_xc5000_tuner_callback;
 }
 
 /* DVB-USB and USB stuff follows */