From a1a4e813fc04273e44ed25e0aa822f955a6d0a2c Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 25 Sep 2008 09:47:07 -0300 Subject: [PATCH] --- yaml --- r: 114007 b: refs/heads/master c: 767f3b3bf23244d52be0492df20b0eaf14f501c5 h: refs/heads/master i: 114005: c1176cc5f21bdeaad83a3e83ce8633d9291d1620 114003: f0bd3b62c340c8ed6bdb614ba25f26c7ac1b5187 113999: a7f113502ca5bf773e66009decea45b60e2c4142 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5192e3638ee6..47bd8d1dcd73 100644 --- 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 index 8b74e13a6460..9891ca0924a3 100644 --- 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 */