aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorJan Nijs <jan.nijs@scarlet.be>2006-10-07 01:06:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:52 -0200
commit565ef12713c5620b6f802d67861153a3f68499a4 (patch)
tree668360662c2eada3342e11b731058706ad9e5980 /drivers/media
parente2d79439c2253571e4d32fe959663b5615d89907 (diff)
V4L/DVB (5135): Qt1010: correct hardlockup when an app access the DVB dongle
This patch changes qt1010.h to use dvb_usb_device struct instead of a dvb_usb_adapter for accessing the private area of the driver. Without this patch my PC hard locks when an application tries to access the DVB tuner. Signed-off-by: Jan Nijs <jan.nijs@scarlet.be> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/qt1010.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/qt1010.h b/drivers/media/dvb/frontends/qt1010.h
index 59ee1cd03e3..8196985e4e4 100644
--- a/drivers/media/dvb/frontends/qt1010.h
+++ b/drivers/media/dvb/frontends/qt1010.h
@@ -79,7 +79,7 @@ static int qt1010_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
{ QT1010_W, 0x01, 0x00 },
};
struct i2c_msg msg;
- struct dvb_usb_device *d = fe->dvb->priv;
+ struct dvb_usb_adapter *adap = fe->dvb->priv;
unsigned long freq = params->frequency;
if (freq % QT1010_MIN_STEP)
@@ -203,10 +203,10 @@ static int qt1010_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
msg.flags = 0;
msg.len = 2;
- msg.addr = d->adapter[0].pll_addr;
+ msg.addr = adap->dev->adapter[0].pll_addr;
msg.buf = &rd[i].reg;
- if (i2c_transfer(&d->i2c_adap, &msg, 1) != 1) {
+ if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {
printk("tuner write failed\n");
return -EIO;
}