Hi Javier,
Am Montag, den 03.09.2012, 14:01 +0200 schrieb javier Martin:
> Hi Philipp,
>
> On 31 August 2012 10:11, Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote:
> > Add a 1 second timeout for each PIC_RUN command to the CODA. In
> > case it locks up, stop all queues and dequeue remaining buffers.
> >
> > Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> > ---
> > Changes since v2:
> > - Call cancel_delayed_work in coda_stop_streaming instead of coda_irq_handler.
> > ---
> > drivers/media/platform/coda.c | 21 +++++++++++++++++++++
> > 1 file changed, 21 insertions(+)
> >
> > diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> > index 7bc2d87..6e3f026 100644
> > --- a/drivers/media/platform/coda.c
> > +++ b/drivers/media/platform/coda.c
> > @@ -137,6 +137,7 @@ struct coda_dev {
> > struct vb2_alloc_ctx *alloc_ctx;
> > struct list_head instances;
> > unsigned long instance_mask;
> > + struct delayed_work timeout;
> > };
> >
> > struct coda_params {
> > @@ -723,6 +724,9 @@ static void coda_device_run(void *m2m_priv)
> > CODA7_REG_BIT_AXI_SRAM_USE);
> > }
> >
> > + /* 1 second timeout in case CODA locks up */
> > + schedule_delayed_work(&dev->timeout, HZ);
> > +
> > coda_command_async(ctx, CODA_COMMAND_PIC_RUN);
> > }
> >
> > @@ -1221,6 +1225,8 @@ static int coda_stop_streaming(struct vb2_queue *q)
> > }
> >
> > if (!ctx->rawstreamon && !ctx->compstreamon) {
> > + cancel_delayed_work(&dev->timeout);
> > +
>
> This breaks compilation. There is no such variable 'dev' in this
> function at this time.
> I see you add it later in patch 9 but I think we should avoid breaking
> bisect as long as possible.
>
> CC drivers/media/video/coda.o
> drivers/media/video/coda.c: In function 'coda_stop_streaming':
> drivers/media/video/coda.c:1227: error: 'dev' undeclared (first use in
> this function)
> drivers/media/video/coda.c:1227: error: (Each undeclared identifier is
> reported only once
> drivers/media/video/coda.c:1227: error: for each function it appears in.)
>
> Could you please add it in this patch instead?
Thank you, I'll fix this next round.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
