Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] NCR5380: Fix bugs and canonicalize irq handler usage
  [SCSI] zfcp: fix cleanup of dismissed error recovery actions
  [SCSI] zfcp: fix dismissal of error recovery actions
  [SCSI] qla1280: convert to use the data buffer accessors
  [SCSI] iscsi: return data transfer residual for data-out commands
  [SCSI] iscsi_tcp: fix potential lockup with write commands
  [SCSI] aacraid: fix security weakness
  [SCSI] aacraid: fix up le32 issues in BlinkLED
  [SCSI] aacraid: fix potential panic in thread stop
  [SCSI] aacraid: don't assign cpu_to_le32(constant) to u8

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 6f8403b82ba1..f5732d8f67fe 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -393,7 +393,7 @@ static irqreturn_t scsi_tt_intr(int irq, void *dummy)
 
 #endif /* REAL_DMA */
 
-        NCR5380_intr(0, 0);
+        NCR5380_intr(irq, dummy);
 
 #if 0
         /* To be sure the int is not masked */
@@ -458,7 +458,7 @@ static irqreturn_t scsi_falcon_intr(int irq, void *dummy)
 
 #endif /* REAL_DMA */
 
-        NCR5380_intr(0, 0);
+        NCR5380_intr(irq, dummy);
         return IRQ_HANDLED;
 }
 
@@ -684,7 +684,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
                  * interrupt after having cleared the pending flag for the DMA
                  * interrupt. */
                 if (request_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr, IRQ_TYPE_SLOW,
-                                 "SCSI NCR5380", scsi_tt_intr)) {
+                                 "SCSI NCR5380", instance)) {
                         printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting",IRQ_TT_MFP_SCSI);
                         scsi_unregister(atari_scsi_host);
                         atari_stram_free(atari_dma_buffer);
@@ -701,7 +701,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
                                          IRQ_TYPE_PRIO, "Hades DMA emulator",
                                          hades_dma_emulator)) {
                                 printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting (MACH_IS_HADES)",IRQ_AUTO_2);
-                                free_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr);
+                                free_irq(IRQ_TT_MFP_SCSI, instance);
                                 scsi_unregister(atari_scsi_host);
                                 atari_stram_free(atari_dma_buffer);
                                 atari_dma_buffer = 0;
@@ -761,7 +761,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
 int atari_scsi_release(struct Scsi_Host *sh)
 {
         if (IS_A_TT())
-                free_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr);
+                free_irq(IRQ_TT_MFP_SCSI, sh);
         if (atari_dma_buffer)
                 atari_stram_free(atari_dma_buffer);
         return 1;