V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed

Do not select FW_LOADER unless it is really required.

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

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 3f4156f9b9c0ee880547d35d5b1aad6e85b756ce..95531a624991644337b3f98dde9c98d8114e6f96 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -1,7 +1,7 @@
 config DVB_AV7110
        tristate "AV7110 cards"
        depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
-       select FW_LOADER
+       select FW_LOADER if !DVB_AV7110_FIRMWARE
        select VIDEO_SAA7146_VV
        select DVB_PLL
        select DVB_VES1820 if !DVB_FE_CUSTOMISE

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 57a101414307def1718e65b2b3ae923d2ead9821..bba23bcd1b11d813326464f80fe72cfd1ff16896 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1701,9 +1701,13 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
 
 static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
 {
+#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE)
        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
 
        return request_firmware(fw, name, &av7110->dev->pci->dev);
+#else
+       return -EINVAL;
+#endif
 }
 
 static struct sp8870_config alps_tdlb7_config = {