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

Next file: linux/drivers/char/cd1865.h
Previous file: linux/drivers/char/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.69/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -54,6 +54,7 @@
 static unsigned int remap=0;
 static unsigned int vidmem=0;
 static unsigned int tuner=0;	/* Default tuner */
+MODULE_PARM(tuner,"i");
 
 static int find_vga(void);
 static void bt848_set_risc_jmps(struct bttv *btv);
@@ -603,7 +604,7 @@
 			}
 			interruptible_sleep_on(&btv->vbiq);
 			sti();
-			if(current->signal & ~current->blocked)
+			if(signal_pending(current))
 			{
 				if(todo==count)
 					return -EINTR;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov