[SCSI] aic7xxx: leaves timer running on init failure

Browse source

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 <jbeulich@novell.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

...

This commit is contained in:

Hannes Reinecke 2009-03-25 11:19:37 +01:00 • committed by James Bottomley

parent c59c61493f

commit a2f5bfcf71

2 changed files with 4 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/scsi/aic7xxx/aic79xx_pci.c

View file

8

drivers/scsi/aic7xxx/aic7xxx_pci.c

View file