V4L/DVB (6192): Ensure start_dma() is capable of starting dma on port VIDB

start_dma() would fail to start dma if a device used VIDB (portb).

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 12 insertions, 7 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index f5b73c4b625e..907ea4c2ea38 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/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/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index c0f4e4337351..e44698a6bede 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/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];
 };