Commit 661c7e44 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab

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: default avatarSteven Toth <stoth@hauppauge.com>
Reviewed-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent bfde287c
...@@ -1015,9 +1015,12 @@ static int cx23885_start_dma(struct cx23885_tsport *port, ...@@ -1015,9 +1015,12 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
/* write TS length to chip */ /* write TS length to chip */
cx_write(port->reg_lngth, buf->vb.width); cx_write(port->reg_lngth, buf->vb.width);
if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) { if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n", (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
__FUNCTION__, cx23885_boards[dev->board].portc ); 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; return -EINVAL;
} }
......
...@@ -86,12 +86,14 @@ struct cx23885_input { ...@@ -86,12 +86,14 @@ struct cx23885_input {
u32 gpio0, gpio1, gpio2, gpio3; u32 gpio0, gpio1, gpio2, gpio3;
}; };
typedef enum {
CX23885_MPEG_UNDEFINED = 0,
CX23885_MPEG_DVB
} port_t;
struct cx23885_board { struct cx23885_board {
char *name; char *name;
enum { port_t portb, portc;
CX23885_MPEG_UNDEFINED = 0,
CX23885_MPEG_DVB
} portc;
struct cx23885_input input[MAX_CX23885_INPUT]; struct cx23885_input input[MAX_CX23885_INPUT];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment