Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (138 commits)
  [SCSI] libata: implement minimal transport template for ->eh_timed_out
  [SCSI] eliminate rphy allocation in favour of expander/end device allocation
  [SCSI] convert mptsas over to end_device/expander allocations
  [SCSI] allow displaying and setting of cache type via sysfs
  [SCSI] add scsi_mode_select to scsi_lib.c
  [SCSI] 3ware 9000 add big endian support
  [SCSI] qla2xxx: update MAINTAINERS
  [SCSI] scsi: move target_destroy call
  [SCSI] fusion - bump version
  [SCSI] fusion - expander hotplug suport in mptsas module
  [SCSI] fusion - exposing raid components in mptsas
  [SCSI] fusion - memory leak, and initializing fields
  [SCSI] fusion - exclosure misspelled
  [SCSI] fusion - cleanup mptsas event handling functions
  [SCSI] fusion - removing target_id/bus_id from the VirtDevice structure
  [SCSI] fusion - static fix's
  [SCSI] fusion - move some debug firmware event debug msgs to verbose level
  [SCSI] fusion - loginfo header update
  [SCSI] add scsi_reprobe_device
  [SCSI] megaraid_sas: fix extended timeout handling
  ...

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 531a1f9ceb51..de80cdfb5b9d 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1716,12 +1716,7 @@ static void seldo_run(struct Scsi_Host *shpnt)
                 ADDMSGO(BUS_DEVICE_RESET);
         } else if (SYNCNEG==0 && SYNCHRONOUS) {
                 CURRENT_SC->SCp.phase |= syncneg;
-                ADDMSGO(EXTENDED_MESSAGE);
-                ADDMSGO(3);
-                ADDMSGO(EXTENDED_SDTR);
-                ADDMSGO(50);            /* 200ns */
-                ADDMSGO(8);             /* 8 byte req/ack offset */
-
+                MSGOLEN += spi_populate_sync_msg(&MSGO(MSGOLEN), 50, 8);
                 SYNCNEG=1;              /* negotiation in progress */
         }