From 18874ccccdac7863ce7f6b24aaee14b4d90786ab Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 25 Mar 2009 11:19:37 +0100 Subject: [PATCH] --- yaml --- r: 142089 b: refs/heads/master c: a2f5bfcf711aa72ad5587b533a1909334c2533a4 h: refs/heads/master i: 142087: de1064c13953252590969bb13274ad2980369f24 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aic7xxx/aic79xx_pci.c | 6 ++---- trunk/drivers/scsi/aic7xxx/aic7xxx_pci.c | 8 ++------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a3df8dbe7a37..f109be28de65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c59c61493febac295e71a2c017fc0075620dbc6f +refs/heads/master: a2f5bfcf711aa72ad5587b533a1909334c2533a4 diff --git a/trunk/drivers/scsi/aic7xxx/aic79xx_pci.c b/trunk/drivers/scsi/aic7xxx/aic79xx_pci.c index a734d77e880e..b8423c428a14 100644 --- a/trunk/drivers/scsi/aic7xxx/aic79xx_pci.c +++ b/trunk/drivers/scsi/aic7xxx/aic79xx_pci.c @@ -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 diff --git a/trunk/drivers/scsi/aic7xxx/aic7xxx_pci.c b/trunk/drivers/scsi/aic7xxx/aic7xxx_pci.c index c07cb6eebb02..4347c8dc459f 100644 --- a/trunk/drivers/scsi/aic7xxx/aic7xxx_pci.c +++ b/trunk/drivers/scsi/aic7xxx/aic7xxx_pci.c @@ -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); } /*