diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-08-08 20:06:50 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-09 13:19:25 -0400 |
commit | a80b3424d9fde3c4b6d62adaf6dda78128dc5c27 (patch) | |
tree | 0c04185b806fa2239dea2ff681d0fec8db746be9 | |
parent | 0d7323c865608dffb1ed39ec2f3841697ec3e009 (diff) |
[SCSI] aic79xx: fix boot panic with no hardware
There's a spurious (and illegal since it's marked __exit) call to
ahc_linux_exit() in ahc_linux_init() which causes a double list
deletion of the transport class; remove it.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 4 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index acaeebd50465..2f158624c5d2 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -2326,8 +2326,6 @@ done: | |||
2326 | return (retval); | 2326 | return (retval); |
2327 | } | 2327 | } |
2328 | 2328 | ||
2329 | static void ahd_linux_exit(void); | ||
2330 | |||
2331 | static void ahd_linux_set_width(struct scsi_target *starget, int width) | 2329 | static void ahd_linux_set_width(struct scsi_target *starget, int width) |
2332 | { | 2330 | { |
2333 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); | 2331 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); |
@@ -2772,7 +2770,7 @@ ahd_linux_init(void) | |||
2772 | if (ahd_linux_detect(&aic79xx_driver_template) > 0) | 2770 | if (ahd_linux_detect(&aic79xx_driver_template) > 0) |
2773 | return 0; | 2771 | return 0; |
2774 | spi_release_transport(ahd_linux_transport_template); | 2772 | spi_release_transport(ahd_linux_transport_template); |
2775 | ahd_linux_exit(); | 2773 | |
2776 | return -ENODEV; | 2774 | return -ENODEV; |
2777 | } | 2775 | } |
2778 | 2776 | ||
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 3fbc10e58cc2..22434849de48 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -2335,8 +2335,6 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc) | |||
2335 | { | 2335 | { |
2336 | } | 2336 | } |
2337 | 2337 | ||
2338 | static void ahc_linux_exit(void); | ||
2339 | |||
2340 | static void ahc_linux_set_width(struct scsi_target *starget, int width) | 2338 | static void ahc_linux_set_width(struct scsi_target *starget, int width) |
2341 | { | 2339 | { |
2342 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); | 2340 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); |