Skip to content

L
linux
Commit 01ea7c89 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] sym53c8xxx wasnt updated to new irq code etc

parent 93cf74a8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
drivers/scsi/sym53c8xx.c
View file @ 01ea7c89
...@@ -1327,7 +1327,7 @@ MODULE_PARM(sym53c8xx, "s"); ...@@ -1327,7 +1327,7 @@ MODULE_PARM(sym53c8xx, "s");
#define SetScsiAbortResult(cmd) SetScsiResult(cmd, DID_ABORT, 0xff) #define SetScsiAbortResult(cmd) SetScsiResult(cmd, DID_ABORT, 0xff)
#endif #endif
static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs); static irqreturn_t sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs);
static void sym53c8xx_timeout(unsigned long np); static void sym53c8xx_timeout(unsigned long np);
#define initverbose (driver_setup.verbose) #define initverbose (driver_setup.verbose)
...@@ -7374,7 +7374,7 @@ void ncr_complete (ncb_p np, ccb_p cp) ...@@ -7374,7 +7374,7 @@ void ncr_complete (ncb_p np, ccb_p cp)
} }
if (cp->xerr_status & XE_BAD_PHASE) { if (cp->xerr_status & XE_BAD_PHASE) {
PRINT_ADDR(cmd); PRINT_ADDR(cmd);
printk ("illegal scsi phase (4/5).\n"); printk ("invalid scsi phase (4/5).\n");
} }
if (cp->xerr_status & XE_SODL_UNRUN) { if (cp->xerr_status & XE_SODL_UNRUN) {
PRINT_ADDR(cmd); PRINT_ADDR(cmd);
...@@ -13660,7 +13660,7 @@ printk("sym53c8xx : command successfully queued\n"); ...@@ -13660,7 +13660,7 @@ printk("sym53c8xx : command successfully queued\n");
** routine for each host that uses this IRQ. ** routine for each host that uses this IRQ.
*/ */
static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs) static irqreturn_t sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
{ {
unsigned long flags; unsigned long flags;
ncb_p np = (ncb_p) dev_id; ncb_p np = (ncb_p) dev_id;
...@@ -13685,6 +13685,7 @@ static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs) ...@@ -13685,6 +13685,7 @@ static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
ncr_flush_done_cmds(done_list); ncr_flush_done_cmds(done_list);
NCR_UNLOCK_SCSI_DONE(done_list->device->host, flags); NCR_UNLOCK_SCSI_DONE(done_list->device->host, flags);
} }
return IRQ_HANDLED;
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7