adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-03 22:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Steven Toth 2007-09-06 16:07:49 -03:00 committed by Mauro Carvalho Chehab
parent bfde287c2f
commit 661c7e44c5
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/video/cx23885/cx23885-core.c
View file

@ -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;
}

10
drivers/media/video/cx23885/cx23885.h
View file

@ -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];
};