Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04d934ff authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6432): tuner: fix CONFIG_TUNER_TEA5761=m 



This patch fixes CONFIG_TUNER_TEA5761=m broken by
commit ca805d57.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 52c28d4b

drivers/media/video/tuner-core.c

+1 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


/* standard i2c insmod options */

static unsigned short normal_i2c[] = {

#ifdef CONFIG_TUNER_TEA5761

#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))

	0x10,

#endif

	0x42, 0x43, 0x4a, 0x4b,			/* tda8290 */
@@ -292,7 +292,6 @@ static void set_type(struct i2c_client *c, unsigned int type, 
		}

		t->mode_mask = T_RADIO;

		break;

#ifdef CONFIG_TUNER_TEA5761

	case TUNER_TEA5761:

		if (tea5761_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) {

			t->type = TUNER_ABSENT;
@@ -301,7 +300,6 @@ static void set_type(struct i2c_client *c, unsigned int type, 
		}

		t->mode_mask = T_RADIO;

		break;

#endif

	case TUNER_PHILIPS_FMD1216ME_MK3:

		buffer[0] = 0x0b;

		buffer[1] = 0xdc;
@@ -594,7 +592,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) 
	/* autodetection code based on the i2c addr */

	if (!no_autodetect) {

		switch (addr) {

#ifdef CONFIG_TUNER_TEA5761

		case 0x10:

			if (tea5761_autodetection(t->i2c.adapter, t->i2c.addr) != EINVAL) {

				t->type = TUNER_TEA5761;
@@ -606,7 +603,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) 
				goto register_client;

			}

			break;

#endif

		case 0x42:

		case 0x43:

		case 0x4a: