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: (25 commits)
  [SCSI] qlogicpt: section fixes
  [SCSI] mvsas: convert from rough draft to working driver
  [SCSI] mvsas: Add Marvell 6440 SAS/SATA driver
  [SCSI] libsas: correctly flush the LU queue on error recovery
  [SCSI] aic94xx: fix sequencer hang on error recovery
  [SCSI] st: compile fix when DEBUG set to one
  [SCSI] stex: stex_internal_copy should be called with sg_count in struct st_ccb
  [SCSI] stex: stex_direct_copy shouldn't call dma_map_sg
  [SCSI] lpfc: Balance locking
  [SCSI] qla4xxx: fix up residual handling
  [SCSI] libsas: fix error handling
  [SCSI] arcmsr: fix message allocation
  [SCSI] mptbase: fix use-after-free's
  [SCSI] iscsi transport: make 2 functions static
  [SCSI] lpfc: make lpfc_disable_node() static
  [SCSI] ips: fix data buffer accessors conversion bug
  [SCSI] gdth: don't call pci_free_consistent under spinlock
  [SCSI] qla2xxx: fix compile warning for printk format
  [SCSI] aic7xx: mitigate HOST_MSG_LOOP invalid SCB ff panic
  [SCSI] scsi_debug: disable clustering
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 6d2ae641273c..64e62ce59c15 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -695,15 +695,16 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                         scb_index = ahc_inb(ahc, SCB_TAG);
                         scb = ahc_lookup_scb(ahc, scb_index);
                         if (devinfo.role == ROLE_INITIATOR) {
-                                if (scb == NULL)
-                                        panic("HOST_MSG_LOOP with "
-                                              "invalid SCB %x\n", scb_index);
+                                if (bus_phase == P_MESGOUT) {
+                                        if (scb == NULL)
+                                                panic("HOST_MSG_LOOP with "
+                                                      "invalid SCB %x\n",
+                                                      scb_index);
 
-                                if (bus_phase == P_MESGOUT)
                                         ahc_setup_initiator_msgout(ahc,
                                                                    &devinfo,
                                                                    scb);
-                                else {
+                                } else {
                                         ahc->msg_type =
                                             MSG_TYPE_INITIATOR_MSGIN;
                                         ahc->msgin_index = 0;