diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/scsi/mesh.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/scsi/mesh.c')
| -rw-r--r-- | drivers/scsi/mesh.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index c08589b58..316d661b5 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1346,11 +1346,11 @@ handle_reset(struct mesh_state *ms) static void do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) { - /*unsigned long flags;*/ + unsigned long flags; - /*spin_lock_irqsave(&io_request_lock, flags);*/ + spin_lock_irqsave(&io_request_lock, flags); mesh_interrupt(irq, dev_id, ptregs); - /*spin_unlock_irqrestore(&io_request_lock, flags);*/ + spin_unlock_irqrestore(&io_request_lock, flags); } static void handle_error(struct mesh_state *ms) @@ -1643,6 +1643,7 @@ mesh_done(struct mesh_state *ms, int start_next) static void mesh_completed(struct mesh_state *ms, Scsi_Cmnd *cmd) { +#if 0 if (ms->completed_q == NULL) ms->completed_q = cmd; else @@ -1651,6 +1652,9 @@ mesh_completed(struct mesh_state *ms, Scsi_Cmnd *cmd) cmd->host_scribble = NULL; queue_task(&ms->tqueue, &tq_immediate); mark_bh(IMMEDIATE_BH); +#else + (*cmd->scsi_done)(cmd); +#endif } /* |