From b9d68b8bcef72be7f74a7e0b34ebdf573518914a Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Wed, 4 Nov 2009 22:33:33 -0300 Subject: [PATCH] --- yaml --- r: 174135 b: refs/heads/master c: f0076e60b5a61072b671b597ed2cc210f1b3cbf1 h: refs/heads/master i: 174133: 01547a2875101595cbfaa75189269f2d480e49b4 174131: 2c2883f69dbabce8777992eff7d01fc0c6abb280 174127: a40365703c7c8724c8429d4064adcf10c8c1be85 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-queue.c | 2 +- trunk/drivers/media/video/cx18/cx18-scb.h | 4 ++-- trunk/drivers/media/video/cx18/cx23418.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 76e0143b1ca0..e366c399cd6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c76e6f11662f49dd31a49a07f4c06ee9bea6572b +refs/heads/master: f0076e60b5a61072b671b597ed2cc210f1b3cbf1 diff --git a/trunk/drivers/media/video/cx18/cx18-queue.c b/trunk/drivers/media/video/cx18/cx18-queue.c index fa1ed7897d97..9061ff3eac6f 100644 --- a/trunk/drivers/media/video/cx18/cx18-queue.c +++ b/trunk/drivers/media/video/cx18/cx18-queue.c @@ -201,7 +201,7 @@ int cx18_stream_alloc(struct cx18_stream *s) CX18_ERR("Too many buffers, cannot fit in SCB area\n"); CX18_ERR("Max buffers = %zd\n", - bufsz / sizeof(struct cx18_mdl)); + bufsz / sizeof(struct cx18_mdl_ent)); return -ENOMEM; } diff --git a/trunk/drivers/media/video/cx18/cx18-scb.h b/trunk/drivers/media/video/cx18/cx18-scb.h index 1dc1c431f5a1..368f23d08709 100644 --- a/trunk/drivers/media/video/cx18/cx18-scb.h +++ b/trunk/drivers/media/video/cx18/cx18-scb.h @@ -81,7 +81,7 @@ /* This structure is used by EPU to provide memory descriptors in its memory */ -struct cx18_mdl { +struct cx18_mdl_ent { u32 paddr; /* Physical address of a buffer segment */ u32 length; /* Length of the buffer segment */ }; @@ -272,7 +272,7 @@ struct cx18_scb { struct cx18_mailbox ppu2epu_mb; struct cx18_mdl_ack cpu_mdl_ack[CX18_MAX_STREAMS][CX18_MAX_MDL_ACKS]; - struct cx18_mdl cpu_mdl[1]; + struct cx18_mdl_ent cpu_mdl[1]; }; void cx18_init_scb(struct cx18 *cx); diff --git a/trunk/drivers/media/video/cx18/cx23418.h b/trunk/drivers/media/video/cx18/cx23418.h index 9956abf576c5..868806effdcf 100644 --- a/trunk/drivers/media/video/cx18/cx23418.h +++ b/trunk/drivers/media/video/cx18/cx23418.h @@ -363,7 +363,7 @@ /* Description: This command provides the offset to a Memory Descriptor List IN[0] - Task handle. Handle of the task to start IN[1] - Offset of the MDL from the beginning of the local DDR. - IN[2] - Number of cx18_mdl structures in the array pointed to by IN[1] + IN[2] - Number of cx18_mdl_ent structures in the array pointed to by IN[1] IN[3] - Buffer ID IN[4] - Total buffer length ReturnCode - One of the ERR_DE_... */