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

Commit c9076279 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6908): tda8290: add the option not to probe for tuners passed into tda829x_config 



Prevent the tda8290 module from probing for tuners during tda829x_attach,
by passing:

.probe_tuner = TDA829X_DONT_PROBE,

...in struct tda829x_config

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent fe0bf6d7

drivers/media/video/tda8290.c

+8 −1
Original line number Diff line number Diff line
@@ -688,10 +688,17 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, 
		       sizeof(struct analog_demod_ops));

	}



	if (tda829x_find_tuner(fe) < 0)

	if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) &&

	    (tda829x_find_tuner(fe) < 0))

		goto fail;



	switch (priv->ver) {

	case TDA8290:

		name = "tda8290";

		break;

	case TDA8295:

		name = "tda8295";

		break;

	case TDA8290 | TDA8275:

		name = "tda8290+75";

		break;

drivers/media/video/tda8290.h

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
struct tda829x_config {

	unsigned int *lna_cfg;

	int (*tuner_callback) (void *dev, int command, int arg);



	unsigned int probe_tuner:1;

#define TDA829X_PROBE_TUNER 0

#define TDA829X_DONT_PROBE  1

};



#if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))