diff options
| author | Michael Krufky | 2008-04-22 19:46:05 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-04-24 19:07:51 +0200 |
| commit | e827931e37295329be0bc0e6c0283bfa4807b8f9 (patch) | |
| tree | 347be84f51549c5a5ee4d174035cd6bfdd088d2c /drivers/media/video/tuner-simple.c | |
| parent | V4L/DVB (7379): tuner: prevent instance sharing if i2c adapter is NULL (diff) | |
| download | kernel-qcow2-linux-e827931e37295329be0bc0e6c0283bfa4807b8f9.tar.gz kernel-qcow2-linux-e827931e37295329be0bc0e6c0283bfa4807b8f9.tar.xz kernel-qcow2-linux-e827931e37295329be0bc0e6c0283bfa4807b8f9.zip | |
V4L/DVB (7380): tuner-simple: warn if tuner can't be probed during attach
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tuner-simple.c')
| -rw-r--r-- | drivers/media/video/tuner-simple.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c index b95ed1f489a0..07007d67d45f 100644 --- a/drivers/media/video/tuner-simple.c +++ b/drivers/media/video/tuner-simple.c @@ -987,6 +987,28 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe, return NULL; } + /* If i2c_adap is set, check that the tuner is at the correct address. + * Otherwise, if i2c_adap is NULL, the tuner will be programmed directly + * by the digital demod via calc_regs. + */ + if (i2c_adap != NULL) { + u8 b[1]; + struct i2c_msg msg = { + .addr = i2c_addr, .flags = I2C_M_RD, + .buf = b, .len = 1, + }; + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 1); + + if (1 != i2c_transfer(i2c_adap, &msg, 1)) + tuner_warn("unable to probe %s, proceeding anyway.", + tuners[type].name); + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); + } + mutex_lock(&tuner_simple_list_mutex); instance = hybrid_tuner_request_state(struct tuner_simple_priv, priv, |