leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] aic7xxx: add back locking

Browse Source 
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>
This commit is contained in:
James Bottomley 2005-05-17 21:09:52 -05:00 committed by James Bottomley
parent c7525233d2
commit fb3089dfb5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/aic7xxx/aic7xxx_osm.c
View File

@ -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