diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 19:50:08 +0200 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 19:50:08 +0200 |
| commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
| tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | |
| parent | JFS: Improve sync barrier processing (diff) | |
| parent | [PATCH] x86_64 fsnotify build fix (diff) | |
| download | linux-6de7dc2c4c713d037c19aa1e310d240f16973414.tar.xz linux-6de7dc2c4c713d037c19aa1e310d240f16973414.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm_pci.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c index 89d737ee551a..9d318ce2c993 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c @@ -143,10 +143,6 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev) struct ahc_softc *ahc = pci_get_drvdata(pdev); u_long s; - ahc_list_lock(&s); - TAILQ_REMOVE(&ahc_tailq, ahc, links); - ahc_list_unlock(&s); - ahc_lock(ahc, &s); ahc_intr_enable(ahc, FALSE); ahc_unlock(ahc, &s); @@ -208,8 +204,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return (-error); } pci_set_drvdata(pdev, ahc); - if (aic7xxx_detect_complete) - ahc_linux_register_host(ahc, &aic7xxx_driver_template); + ahc_linux_register_host(ahc, &aic7xxx_driver_template); return (0); } |