diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/cdrom | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/cdu31a.c | 6 | ||||
| -rw-r--r-- | drivers/cdrom/mcdx.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index e2c269bcf..8e4960525 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c @@ -844,7 +844,7 @@ do_sony_cd_cmd(unsigned char cmd, while (sony_inuse) { interruptible_sleep_on(&sony_wait); - if (current->signal & ~current->blocked) + if (signal_pending(current)) { result_buffer[0] = 0x20; result_buffer[1] = SONY_SIGNAL_OP_ERR; @@ -1556,7 +1556,7 @@ do_cdu31a_request(void) while (sony_inuse) { interruptible_sleep_on(&sony_wait); - if (current->signal & ~current->blocked) + if (signal_pending(current)) { restore_flags(flags); if (CURRENT && CURRENT->rq_status != RQ_INACTIVE) @@ -2262,7 +2262,7 @@ read_audio(struct cdrom_read_audio *ra, while (sony_inuse) { interruptible_sleep_on(&sony_wait); - if (current->signal & ~current->blocked) + if (signal_pending(current)) { restore_flags(flags); return -EAGAIN; diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index 242508f9d..dea152349 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c @@ -947,7 +947,7 @@ static void mcdx_delay(struct s_drive_stuff *stuff, long jifs) xtrace(SLEEP, "*** delay: sleepq\n"); interruptible_sleep_on(&stuff->sleepq); xtrace(SLEEP, "delay awoken\n"); - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { xtrace(SLEEP, "got signal\n"); } } @@ -1410,7 +1410,7 @@ static int mcdx_xfer(struct s_drive_stuff *stuffp, if (!stuffp->introk) { xtrace(XFER, "error via interrupt\n"); } else if (current->timeout == 0) { xtrace(XFER, "timeout\n"); } - else if (current->signal & ~current->blocked) { + else if (signal_pending(current)) { xtrace(XFER, "signal\n"); } else continue; |