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

Commit 409d84f8 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6284): cx23885: Update to new videobuf code 



cx23885 was still uses the old video-buf includes and code, which would only
`work' if one happened to be compiling against a kernel that had the old
headers.  Even then, it wouldn't actually work, it would just compile without
errors.

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5a3ebe87

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

+6 −4
Original line number Diff line number Diff line
@@ -1008,10 +1008,12 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc, 


void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)

{

	struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);



	BUG_ON(in_interrupt());

	videobuf_waiton(&buf->vb, 0, 0);

	videobuf_dma_unmap(q, &buf->vb.dma);

	videobuf_dma_free(&buf->vb.dma);

	videobuf_dma_unmap(q, dma);

	videobuf_dma_free(dma);

	btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);

	buf->vb.state = STATE_NEEDS_INIT;

}
@@ -1176,7 +1178,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port, 
		if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))

			goto fail;

		cx23885_risc_databuffer(dev->pci, &buf->risc,

				     buf->vb.dma.sglist,

					videobuf_to_dma(&buf->vb)->sglist,

					buf->vb.width, buf->vb.height);

	}

	buf->vb.state = STATE_PREPARED;

drivers/media/video/cx23885/cx23885.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <media/v4l2-common.h>

#include <media/tuner.h>

#include <media/tveeprom.h>

#include <media/video-buf.h>

#include <media/video-buf-dvb.h>

#include <media/videobuf-dma-sg.h>

#include <media/videobuf-dvb.h>



#include "btcx-risc.h"

#include "cx23885-reg.h"