Merge HEAD from ../scsi-misc-2.6-tmp

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 687f19e9cf0..54173887e16 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -635,6 +635,8 @@ ahc_linux_slave_alloc(struct scsi_device *sdev)
         
         targ->sdev[sdev->lun] = sdev;
 
+        spi_period(starget) = 0;
+
         return 0;
 }
 
@@ -1612,9 +1614,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
                 if (channel == 'B')
                         target_offset += 8;
                 starget = ahc->platform_data->starget[target_offset];
-                targ = scsi_transport_target_data(starget);
-                if (targ == NULL)
+                if (starget == NULL)
                         break;
+                targ = scsi_transport_target_data(starget);
 
                 target_ppr_options =
                         (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
@@ -2329,8 +2331,6 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc)
 {
 }
 
-static void ahc_linux_exit(void);
-
 static void ahc_linux_set_width(struct scsi_target *starget, int width)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);