summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/saa7164/Kconfig3
-rw-r--r--linux/drivers/media/video/saa7164/saa7164-core.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7164/Kconfig b/linux/drivers/media/video/saa7164/Kconfig
index 582556792..353263725 100644
--- a/linux/drivers/media/video/saa7164/Kconfig
+++ b/linux/drivers/media/video/saa7164/Kconfig
@@ -1,7 +1,6 @@
config VIDEO_SAA7164
tristate "NXP SAA7164 support"
depends on DVB_CORE && PCI && I2C
- depends on HOTPLUG # due to FW_LOADER
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_TUNER
@@ -9,7 +8,7 @@ config VIDEO_SAA7164
select VIDEOBUF_DVB
select DVB_TDA10048 if !DVB_FE_CUSTOMISE
select DVB_S5H1411 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+ select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
---help---
This is a video4linux driver for NXP SAA7164 based
TV cards.
diff --git a/linux/drivers/media/video/saa7164/saa7164-core.c b/linux/drivers/media/video/saa7164/saa7164-core.c
index 91dbb1ac0..77eb7331b 100644
--- a/linux/drivers/media/video/saa7164/saa7164-core.c
+++ b/linux/drivers/media/video/saa7164/saa7164-core.c
@@ -109,7 +109,7 @@ static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
}
#endif
/* Feed the transport payload into the kernel demux */
- dvb_dmx_swfilter_packets(&port->dvb.demux, buf->cpu,
+ dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu,
SAA7164_TS_NUMBER_OF_LINES);
}