diff --git a/[refs] b/[refs]
index 9d89bc09b1c9..06d934d41d2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 122b5dbea6fa3727fc99fbdc2cf5e4d9b8a5bb00
+refs/heads/master: 88bbdf74fcfa7ed1fd1a3c825ee5575752344326
diff --git a/trunk/include/media/saa7146.h b/trunk/include/media/saa7146.h
index fee579f10b32..afa5ff6469b3 100644
--- a/trunk/include/media/saa7146.h
+++ b/trunk/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));