From f4c315a3fca5df3ea6ee83b692b828f7d4443280 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Sun, 17 Sep 2006 07:38:15 +0200 Subject: [PATCH] --- yaml --- r: 35056 b: refs/heads/master c: cf2b5d3fcab77a9390293920ec5b49e67eced200 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e8fa18f6463f..f86d37f9bb23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e3c60e3a8c7013d55768aa7256bb5a7f66b0bb4 +refs/heads/master: cf2b5d3fcab77a9390293920ec5b49e67eced200 diff --git a/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c b/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c index 0b3c01ac4259..64c8b88a429f 100644 --- a/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -2539,6 +2539,7 @@ static void ahc_linux_set_iu(struct scsi_target *starget, int iu) static void ahc_linux_get_signalling(struct Scsi_Host *shost) { struct ahc_softc *ahc = *(struct ahc_softc **)shost->hostdata; + unsigned long flags; u8 mode; if (!(ahc->features & AHC_ULTRA2)) { @@ -2550,7 +2551,11 @@ static void ahc_linux_get_signalling(struct Scsi_Host *shost) return; } + ahc_lock(ahc, &flags); + ahc_pause(ahc); mode = ahc_inb(ahc, SBLKCTL); + ahc_unpause(ahc); + ahc_unlock(ahc, &flags); if (mode & ENAB40) spi_signalling(shost) = SPI_SIGNAL_LVD;