V4L/DVB (8890): budget: Add callback to load firmware for the TDHD1 tuner

Supply callback to load firmware for the TDHD1 tuner (using request_firmware).

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h
index de8aac7d7ae0ecbfaf868175c8eb8c3b56328968..51f1706786507ad20521a7e109e77a44068d2527 100644 (file)
--- a/drivers/media/dvb/frontends/tdhd1.h
+++ b/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/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index a4664ba5aded8259ff654044dfae94e343840699..d95203d55403ef5505afd51e51a147564e08d4ef 100644 (file)
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/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)
 {