summaryrefslogtreecommitdiffstats
path: root/drivers/char/bttv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/bttv.c')
-rw-r--r--drivers/char/bttv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/bttv.c b/drivers/char/bttv.c
index 56d38d7a2..4c1fa303c 100644
--- a/drivers/char/bttv.c
+++ b/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 @@ static long bttv_read(struct video_device *v, char *buf, unsigned long count, in
}
interruptible_sleep_on(&btv->vbiq);
sti();
- if(current->signal & ~current->blocked)
+ if(signal_pending(current))
{
if(todo==count)
return -EINTR;