patch-2.2.15 linux/drivers/char/bttv.c

• Lines: 26
• Date: Fri Apr 21 12:45:51 2000
• Orig file: v2.2.14/drivers/char/bttv.c
• Orig date: Tue Jan 4 21:18:45 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -1455,6 +1455,7 @@
 {
 	unsigned int *ro, *re;
 	unsigned int *vbuf;
+	unsigned long flags;
 	
 	if(btv->fbuffer==NULL)
 	{
@@ -1506,6 +1507,9 @@
 	re=ro+2048;
         make_vrisctab(btv, ro, re, vbuf, mp->width, mp->height, mp->format);
 	/* bt848_set_risc_jmps(btv); */
+	
+	save_flags(flags);
+	cli();
         btv->frame_stat[mp->frame] = GBUFFER_GRABBING;
         if (btv->grabbing) {
 		btv->gfmt_next=palette2fmt[mp->format];
@@ -1529,6 +1533,7 @@
 		}
 		btv->risc_jmp[12]=cpu_to_le32(BT848_RISC_JUMP|(0x8<<16)|BT848_RISC_IRQ);
         }
+        restore_flags(flags);
 	btor(3, BT848_CAP_CTL);
 	btor(3, BT848_GPIO_DMA_CTL);
 	/* interruptible_sleep_on(&btv->capq); */