From: Hannes Reinecke Date: Wed, 25 Mar 2009 10:19:37 +0000 (+0100) Subject: [SCSI] aic7xxx: leaves timer running on init failure X-Git-Tag: v2.6.30-rc1~185^2~42 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f5bfcf711aa72ad5587b533a1909334c2533a4;p=pandora-kernel.git [SCSI] 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 Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley --- Reading git-diff-tree failed