Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / cx88 / cx88-dvb.c

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 367a653f4c95ca50f7fb9280eabafb274788760a..90717ee944ec5632e62ae2d3462f7987718671db 100644 (file)
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -67,6 +67,10 @@ static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug,"enable debug messages [dvb]");
 
+static unsigned int dvb_buf_tscnt = 32;
+module_param(dvb_buf_tscnt, int, 0644);
+MODULE_PARM_DESC(dvb_buf_tscnt, "DVB Buffer TS count [dvb]");
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 #define dprintk(level,fmt, arg...)     if (debug >= level) \
@@ -80,10 +84,10 @@ static int dvb_buf_setup(struct videobuf_queue *q,
        struct cx8802_dev *dev = q->priv_data;
 
        dev->ts_packet_size  = 188 * 4;
-       dev->ts_packet_count = 32;
+       dev->ts_packet_count = dvb_buf_tscnt;
 
        *size  = dev->ts_packet_size * dev->ts_packet_count;
-       *count = 32;
+       *count = dvb_buf_tscnt;
        return 0;
 }