aic7xxx leaves timer running on init failure

PATCH New Hannes Reinecke 1 participant 1 message Mar 25, 2009

Subsystems (2)

SCSI AIC7XXX / AIC79XX SCSI driver

lore

Share & tools

lore

Hannes Reinecke

author

2009-03-25 10:19 UTC #0 lore raw

PATCH 1/1 aic7xxx leaves timer running on init failure

aic79xx leaves timers inserted when ahd_init() (which inserts two timers at its very end) succeeds but ahd_pci_map_int() fails. In this case ahd->init_level gets incremented to 5 only when that function succeeds, but ahd_free() calls ahd_shutdown() only when ahd->init_level == 5, and ahd_shutdown() is where the timers get removed. Since the freeing of the IRQ is not controlled by ahd->init_level, we should increment init_level prior to calling ahd_pci_map_int().

Reported-by Jan Beulich <[email protected]>

Signed-off-by Hannes Reinecke <[email protected]>

---
 drivers/scsi/aic7xxx/aic79xx_pci.c |    6 ++----
 drivers/scsi/aic7xxx/aic7xxx_pci.c |    8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

drivers/scsi/aic7xxx/aic79xx_pci.c +2 -4

index a734d77..b8423c4 100644
@@ -377,14 +377,12 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry)
 	error = ahd_init(ahd);
 	if (error != 0)
 		return (error);
+	ahd->init_level++;
 
 	/*
 	 * Allow interrupts now that we are completely setup.
 	 */
-	error = ahd_pci_map_int(ahd);
-	if (!error)
-		ahd->init_level++;
-	return error;
+	return ahd_pci_map_int(ahd);
 }
 
 #ifdef CONFIG_PM

drivers/scsi/aic7xxx/aic7xxx_pci.c +2 -6

index c07cb6e..4347c8d 100644
@@ -960,16 +960,12 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
 	error = ahc_init(ahc);
 	if (error != 0)
 		return (error);
+	ahc->init_level++;
 
 	/*
 	 * Allow interrupts now that we are completely setup.
 	 */
-	error = ahc_pci_map_int(ahc);
-	if (error != 0)
-		return (error);
-
-	ahc->init_level++;
-	return (0);
+	return ahc_pci_map_int(ahc);
 }
 
 /*

Signature · 1 line

1.5.3.2