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

Commit 24d41228 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Linus Torvalds
Browse files

[PATCH] v4l: 871: fixed bttv to accept radio devices like tea5767 



- Fixed bttv to accept radio devices like tea5767

Signed-off-by: default avatarRicardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3b64e8e2

drivers/media/video/bttv-cards.c

+1 −3
Original line number Diff line number Diff line
@@ -2721,13 +2721,11 @@ struct tvcard bttv_tvcards[] = { 
		.audiomux       = { 0, 1, 2, 2, 3 },

		.needs_tvaudio  = 0,

		.pll            = PLL_28,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.tuner_type     = TUNER_TENA_9533_DI,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.has_remote     = 1,

	#if 0

		.has_radio      = 1,

	#endif

	},

		/* ---- card 0x8a ---------------------------------- */

	[BTTV_BOARD_PV_BT878P_2E] = {

drivers/media/video/bttv-i2c.c

+6 −5
Original line number Diff line number Diff line
@@ -308,22 +308,23 @@ static int attach_inform(struct i2c_client *client) 


	if (btv->tuner_type != UNSET) {

		struct tuner_setup tun_setup;

		struct tuner *t = i2c_get_clientdata(client);



		if ((addr==ADDR_UNSET)||(addr==client->addr)) {

			tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;

			tun_setup.type = btv->tuner_type;

			tun_setup.addr = ADDR_UNSET;



			client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);

		}

		if ((radio_addr==ADDR_UNSET)||(radio_addr==client->addr)) {



		if (t->type != UNSET && t->mode_mask == T_RADIO) {

			tun_setup.type = t->type;

			tun_setup.mode_mask =  T_RADIO;

			tun_setup.type = btv->tuner_type;

			tun_setup.addr = ADDR_UNSET;

		}



		client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);

	}

	}



	if (btv->pinnacle_id != UNSET)

		client->driver->command(client,AUDC_CONFIG_PINNACLE,