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

Commit ecc2fe20 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: video instead of vbi register used 



The VID_A_GPCNT register is for video, not vbi. Read from the right
register and don't write to the video register.

Based upon Devin's initial patch made for an older kernel which I
cleaned up and rebased. Thanks to Kernel Labs for that work.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 6c43a217

drivers/media/pci/cx23885/cx23885-vbi.c

+1 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int cx23885_vbi_irq(struct cx23885_dev *dev, u32 status) 
	if (status & VID_BC_MSK_VBI_RISCI1) {

		dprintk(1, "%s() VID_BC_MSK_VBI_RISCI1\n", __func__);

		spin_lock(&dev->slock);

		count = cx_read(VID_A_GPCNT);

		count = cx_read(VBI_A_GPCNT);

		cx23885_video_wakeup(dev, &dev->vbiq, count);

		spin_unlock(&dev->slock);

		handled++;
@@ -103,7 +103,6 @@ static int cx23885_start_vbi_dma(struct cx23885_dev *dev, 
				VBI_LINE_LENGTH, buf->risc.dma);



	/* reset counter */

	cx_write(VID_A_GPCNT_CTL, 3);

	cx_write(VID_A_VBI_CTRL, 3);

	cx_write(VBI_A_GPCNT_CTL, 3);

	q->count = 0;