aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@steeleye.com>2005-05-17 21:09:52 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-05-20 15:54:43 -0500
commitfb3089dfb58bf07992252b42e77c6f35d45dff5e (patch)
tree4626cee6ff060843a6d717156d3a119a8cb4b482
parentc7525233d2df39b95552f6f49c6b390a9c4d2e80 (diff)
[SCSI] aic7xxx: add back locking
Tampering with the settings has to be done under the host lock ... slave_alloc isn't called under any lock, so this has to be done explicitly. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index c03f2948607..b216de41bff 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -645,7 +645,9 @@ ahc_linux_slave_alloc(struct scsi_device *device)
struct ahc_linux_target *targ;
struct scsi_target *starget = device->sdev_target;
struct ahc_linux_device *dev;
- u_int target_offset;
+ unsigned int target_offset;
+ unsigned long flags;
+ int retval = -ENOMEM;
target_offset = starget->id;
if (starget->channel != 0)
@@ -654,12 +656,14 @@ ahc_linux_slave_alloc(struct scsi_device *device)
ahc = *((struct ahc_softc **)device->host->hostdata);
if (bootverbose)
printf("%s: Slave Alloc %d\n", ahc_name(ahc), device->id);
+ ahc_lock(ahc, &flags);
targ = ahc->platform_data->targets[target_offset];
if (targ == NULL) {
targ = ahc_linux_alloc_target(ahc, starget->channel, starget->id);
struct seeprom_config *sc = ahc->seep_config;
if (targ == NULL)
- return -ENOMEM;
+ goto out;
+
if (sc) {
unsigned short scsirate;
struct ahc_devinfo devinfo;
@@ -701,10 +705,13 @@ ahc_linux_slave_alloc(struct scsi_device *device)
if (dev == NULL) {
dev = ahc_linux_alloc_device(ahc, targ, device->lun);
if (dev == NULL)
- return -ENOMEM;
+ goto out;
}
+ retval = 0;
- return 0;
+ out:
+ ahc_unlock(ahc, &flags);
+ return retval;
}
static int