summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-08-27 21:23:40 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:07:39 -0300
commit7ab10bf72add23f0badf98ead92f58e34e14d35a (patch)
tree098a6c00ca2004f642ec84316449e78c1d8dd635 /drivers/media/video/tuner-core.c
parent96c0b7cfa5de1d6be0a6f6d202a6a078f5577d8f (diff)
downloadop-kernel-dev-7ab10bf72add23f0badf98ead92f58e34e14d35a.zip
op-kernel-dev-7ab10bf72add23f0badf98ead92f58e34e14d35a.tar.gz
V4L/DVB (6131): tea5761: convert from tuner sub-driver into dvb_frontend module
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Mike Isely <isely@pobox.com> Acked-by: Steven Toth <stoth@hauppauge.com> Acked-by: Patrick Boettcher <pb@linuxtv.org> Acked-by: Jarod Wilson <jwilson@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r--drivers/media/video/tuner-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index f24ec1a..848ee64 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -21,6 +21,7 @@
#include "tuner-driver.h"
#include "mt20xx.h"
#include "tda8290.h"
+#include "tea5761.h"
#define UNSET (-1U)
@@ -270,7 +271,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
break;
#ifdef CONFIG_TUNER_TEA5761
case TUNER_TEA5761:
- if (tea5761_tuner_init(t) == EINVAL) {
+ if (tea5761_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) {
t->type = TUNER_ABSENT;
t->mode_mask = T_UNINITIALIZED;
return;
@@ -571,7 +572,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
switch (addr) {
#ifdef CONFIG_TUNER_TEA5761
case 0x10:
- if (tea5761_autodetection(t) != EINVAL) {
+ if (tea5761_autodetection(t->i2c.adapter, t->i2c.addr) != EINVAL) {
t->type = TUNER_TEA5761;
t->mode_mask = T_RADIO;
t->mode = T_STANDBY;
OpenPOWER on IntegriCloud