diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-08-15 20:57:00 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 20:51:40 +0200 |
| commit | a50ee7a72888d072512e4434c44959743bfb1570 (patch) | |
| tree | c33bc6ea2aadf3ad86cd2c1191ee64087a12aa25 /drivers/scsi/ips.c | |
| parent | [SCSI] aic94xx: Free scsi host on error (diff) | |
| download | linux-a50ee7a72888d072512e4434c44959743bfb1570.tar.xz linux-a50ee7a72888d072512e4434c44959743bfb1570.zip | |
[SCSI] ips: Close narrow race in release
We were releasing the IRQ before removing the host, so commands could
still be coming in which would never be seen by the interrupt handler.
Just remove the host before releasing the IRQ to close this race.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ips.c')
| -rw-r--r-- | drivers/scsi/ips.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index b17771b1c605..36b676594336 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -656,6 +656,8 @@ ips_release(struct Scsi_Host *sh) METHOD_TRACE("ips_release", 1); + scsi_remove_host(sh); + for (i = 0; i < IPS_MAX_ADAPTERS && ips_sh[i] != sh; i++) ; if (i == IPS_MAX_ADAPTERS) { @@ -707,7 +709,6 @@ ips_release(struct Scsi_Host *sh) /* free IRQ */ free_irq(ha->irq, ha); - scsi_remove_host(sh); scsi_host_put(sh); ips_released_controllers++; |