From 4eeeb126760529ac057e6fe291bb1aa1cb10c91b Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Thu, 4 Sep 2008 20:35:19 -0300 Subject: [PATCH] --- yaml --- r: 113890 b: refs/heads/master c: 83512e207479d0bdb83ee1e000a306af9e6e870e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/tdhd1.h | 3 +++ trunk/drivers/media/dvb/ttpci/budget.c | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 28916059222d..0a7fca3cf27a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e615eac827094147401c44c9ff955b468d4fa79 +refs/heads/master: 83512e207479d0bdb83ee1e000a306af9e6e870e diff --git a/trunk/drivers/media/dvb/frontends/tdhd1.h b/trunk/drivers/media/dvb/frontends/tdhd1.h index de8aac7d7ae0..51f170678650 100644 --- a/trunk/drivers/media/dvb/frontends/tdhd1.h +++ b/trunk/drivers/media/dvb/frontends/tdhd1.h @@ -28,6 +28,8 @@ #include "tda1004x.h" +static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name); + static struct tda1004x_config alps_tdhd1_204a_config = { .demod_address = 0x8, .invert = 1, @@ -35,6 +37,7 @@ static struct tda1004x_config alps_tdhd1_204a_config = { .xtal_freq = TDA10046_XTAL_4M, .agc_config = TDA10046_AGC_DEFAULT, .if_freq = TDA10046_FREQ_3617, + .request_firmware = alps_tdhd1_204_request_firmware }; static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) diff --git a/trunk/drivers/media/dvb/ttpci/budget.c b/trunk/drivers/media/dvb/ttpci/budget.c index a4664ba5aded..d95203d55403 100644 --- a/trunk/drivers/media/dvb/ttpci/budget.c +++ b/trunk/drivers/media/dvb/ttpci/budget.c @@ -391,6 +391,13 @@ static struct stv0299_config alps_bsbe1_config_activy = { .set_symbol_rate = alps_bsbe1_set_symbol_rate, }; +static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name) +{ + struct budget *budget = (struct budget *)fe->dvb->priv; + + return request_firmware(fw, name, &budget->dev->pci->dev); +} + static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg) {