Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/video/cx23885/cx23885-core.c

+6 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/video/cx23885/cx23885.h

+6 −4
Original line number Diff line number Diff line
@@ -86,12 +86,14 @@ struct cx23885_input { 
	u32             gpio0, gpio1, gpio2, gpio3;

};



struct cx23885_board {

	char                    *name;

	enum {

typedef enum {

	CX23885_MPEG_UNDEFINED = 0,

	CX23885_MPEG_DVB

	} portc;

} port_t;



struct cx23885_board {

	char                    *name;

	port_t			portb, portc;

	struct cx23885_input    input[MAX_CX23885_INPUT];

};