summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorHartmut Birr <e9hack@googlemail.com>2006-11-01 12:46:32 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 09:05:33 -0200
commit88bbdf74fcfa7ed1fd1a3c825ee5575752344326 (patch)
tree64e6af972746c4b952e2fe498ea209e789b83c11 /include/media
parent122b5dbea6fa3727fc99fbdc2cf5e4d9b8a5bb00 (diff)
V4L/DVB (4914): Saa7146: Protect access to the IER register by a spinlock
Protect the access to the IER register of the SAA7146 by the device spinlock. I2C transfers may use interrupt mode now. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/saa7146.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index fee579f10b32..afa5ff6469b3 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -42,10 +42,20 @@ extern unsigned int saa7146_debug;
#define DEB_INT(x) if (0!=(DEBUG_VARIABLE&0x20)) { DEBUG_PROLOG; printk x; } /* interrupt debug messages */
#define DEB_CAP(x) if (0!=(DEBUG_VARIABLE&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */
-#define SAA7146_IER_DISABLE(x,y) \
- saa7146_write(x, IER, saa7146_read(x, IER) & ~(y));
-#define SAA7146_IER_ENABLE(x,y) \
- saa7146_write(x, IER, saa7146_read(x, IER) | (y));
+#define SAA7146_IER_DISABLE(x,y) \
+ do { \
+ unsigned int flags; \
+ spin_lock_irqsave(&x->int_slock, flags); \
+ saa7146_write(x, IER, saa7146_read(x, IER) & ~(y)); \
+ spin_unlock_irqrestore(&x->int_slock, flags); \
+ } while(0)
+#define SAA7146_IER_ENABLE(x,y) \
+ do { \
+ unsigned int flags; \
+ spin_lock_irqsave(&x->int_slock, flags); \
+ saa7146_write(x, IER, saa7146_read(x, IER) | (y)); \
+ spin_unlock_irqrestore(&x->int_slock, flags); \
+ } while(0)
#define SAA7146_ISR_CLEAR(x,y) \
saa7146_write(x, ISR, (y));