diff options
| author | James Bottomley <James.Bottomley@steeleye.com> | 2005-10-02 22:22:35 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-02 22:32:25 +0200 |
| commit | 97af50f60ff1202b0dd9ce481d4cf98c6a578bec (patch) | |
| tree | 5637b5d7d505869ee5aace5ad6ed33085fc78697 /drivers/scsi/aic7xxx/aic79xx_osm_pci.c | |
| parent | [SCSI] fix potential panic with proc on module removal (diff) | |
| download | linux-97af50f60ff1202b0dd9ce481d4cf98c6a578bec.tar.xz linux-97af50f60ff1202b0dd9ce481d4cf98c6a578bec.zip | |
[SCSI] aic7xxx/aic79xx: fix module removal path not to panic
In these drivers, scsi_remove_host() is called too late, at the point
it is called, the driver has already shut down too far to accept any
I/O that the shutdown might generate. Any generated I/O actually
triggers a panic.
Fix this by calling scsi_remove_host() as early as possible and not
calling scsi_host_put() until just before we kfree the ahc_softc.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_osm_pci.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c index 390b53852d4b..bf360ae021ab 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c @@ -95,6 +95,9 @@ ahd_linux_pci_dev_remove(struct pci_dev *pdev) struct ahd_softc *ahd = pci_get_drvdata(pdev); u_long s; + if (ahd->platform_data && ahd->platform_data->host) + scsi_remove_host(ahd->platform_data->host); + ahd_lock(ahd, &s); ahd_intr_enable(ahd, FALSE); ahd_unlock(ahd, &s); |