summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110_ir.c2
-rw-r--r--linux/include/media/saa7146_vv.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index 9d7610f8f..0e8484b11 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -329,8 +329,8 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
if (av_cnt >= ARRAY_SIZE(av_list))
return -ENOSPC;
- av7110_check_ir_config(av7110, true);
av_list[av_cnt++] = av7110;
+ av7110_check_ir_config(av7110, true);
init_timer(&av7110->ir.keyup_timer);
av7110->ir.keyup_timer.function = av7110_emit_keyup;
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h
index 83fe2e3d1..50e33b0e9 100644
--- a/linux/include/media/saa7146_vv.h
+++ b/linux/include/media/saa7146_vv.h
@@ -239,7 +239,8 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits);
#define SAA7146_HPS_SYNC_PORT_B 0x01
/* some memory sizes */
-#define SAA7146_CLIPPING_MEM (14*PAGE_SIZE)
+/* max. 16 clipping rectangles */
+#define SAA7146_CLIPPING_MEM (16 * 4 * sizeof(u32))
/* some defines for the various clipping-modes */
#define SAA7146_CLIPPING_RECT 0x4