Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 282278
b: refs/heads/master
c: dddaaf7
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and James Bottomley committed Dec 15, 2011
1 parent f0af4c9 commit 033914d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b12859ae4776d868ea732424a452826d9ee03df
refs/heads/master: dddaaf793d73f1e3dc931b2040f1578b1bdf0ece
3 changes: 1 addition & 2 deletions trunk/drivers/scsi/mac_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,7 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;

if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW,
"ncr5380", instance)) {
if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) {
printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE;
Expand Down

0 comments on commit 033914d

Please sign in to comment.