---

yaml --- r: 65871 b: refs/heads/master c: 661c7e4 h: refs/heads/master i: 65869: be1a6ef 65867: 8c6c5e0 65863: 1cefb4b 65855: cb5f36c v: v3
git-mirror · Oct 10, 2007 · eea2783 · eea2783
1 parent ea971c4
commit eea2783
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfde287c2f8f0fe4e50e0eb136e4dca6b0ed84dc
+refs/heads/master: 661c7e44c5cc2828c7acb00cb71d985e129e3641
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -1015,9 +1015,12 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 	/* write TS length to chip */
 	cx_write(port->reg_lngth, buf->vb.width);
 
-	if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) {
-		printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n",
-			__FUNCTION__, cx23885_boards[dev->board].portc );
+	if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
+		(!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
+		printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",
+			__FUNCTION__,
+			cx23885_boards[dev->board].portb,
+			cx23885_boards[dev->board].portc );
 		return -EINVAL;
 	}
 

diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
@@ -86,12 +86,14 @@ struct cx23885_input {
 	u32             gpio0, gpio1, gpio2, gpio3;
 };
 
+typedef enum {
+	CX23885_MPEG_UNDEFINED = 0,
+	CX23885_MPEG_DVB
+} port_t;
+
 struct cx23885_board {
 	char                    *name;
-	enum {
-		CX23885_MPEG_UNDEFINED = 0,
-		CX23885_MPEG_DVB
-	} portc;
+	port_t			portb, portc;
 	struct cx23885_input    input[MAX_CX23885_INPUT];
 };