aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-vbi.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2010-07-19 01:19:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-08 23:42:55 -0300
commitdbe83a3b921328e12b2abe894fc692afba293d7f (patch)
treee13443d29b6b929a61584b06dec5f3eff84e2111 /drivers/media/video/cx23885/cx23885-vbi.c
parent98d109f90fc02ce8baf1c2471ffcf8d66fb0d8e6 (diff)
downloadkernel_samsung_smdk4412-dbe83a3b921328e12b2abe894fc692afba293d7f.zip
kernel_samsung_smdk4412-dbe83a3b921328e12b2abe894fc692afba293d7f.tar.gz
kernel_samsung_smdk4412-dbe83a3b921328e12b2abe894fc692afba293d7f.tar.bz2
V4L/DVB: cx23885: Protect PCI interrupt mask manipulations with a spinlock
This patch encapsulates access to the PCI_INT_MSK register and dev->pci_irqmask variable and protects them with a spinlock. This is needed because both the hard IRQ handler and a workhandler will need to manipulate the mask to disable the AV_CORE interrupt. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-vbi.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-vbi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c
index 708a8c7..c0b6038 100644
--- a/drivers/media/video/cx23885/cx23885-vbi.c
+++ b/drivers/media/video/cx23885/cx23885-vbi.c
@@ -74,7 +74,7 @@ static int cx23885_start_vbi_dma(struct cx23885_dev *dev,
q->count = 1;
/* enable irqs */
- cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | 0x01);
+ cx23885_irq_add_enable(dev, 0x01);
cx_set(VID_A_INT_MSK, 0x000022);
/* start dma */