LIRC 0.8.7 Fixes for Maverick

Jeremy Kerr jeremy.kerr at canonical.com
Tue Jun 21 05:48:22 UTC 2011


Hi,

> > --- a/drivers/media/video/cx23885/cx23885-core.c
> > +++ b/drivers/media/video/cx23885/cx23885-core.c
> > @@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
> >  
> >  	BUG_ON(in_interrupt());
> >  	videobuf_waiton(&buf->vb, 0, 0);
> > -	videobuf_dma_unmap(q, dma);
> > +	videobuf_dma_unmap(q->dev, dma);
> >  	videobuf_dma_free(dma);
> >  	btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
> >  	buf->vb.state = VIDEOBUF_NEEDS_INIT;
> 
> This hunk is incorrect - videobuf_dma_unmap() takes a videobuf_queue as
> its first argument. This change passes a struct device instead.
> 
> (The change to the videobuf_dma_unmap API is not in this branch)

Just to clarify - by 'this branch' I mean lucid's lts-backport-maverick
branch, but it's also not in maverick either. This IR patch has been
applied to both though.

Cheers,


Jeremy





More information about the kernel-team mailing list