VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 0eb01bd..3c7a485 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -844,7 +844,6 @@ ahc_linux_detect(Scsi_Host_Template *template)
 {
        struct  ahc_softc *ahc;
        int     found = 0;
-       int     eisa_err, pci_err;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
        /*
@@ -892,13 +891,10 @@ ahc_linux_detect(Scsi_Host_Template *template)
         */
        ahc_list_lockinit();
 
-       pci_err = ahc_linux_pci_init();
-       eisa_err = ahc_linux_eisa_init();
-
-       if(pci_err && eisa_err)
-               goto out;
-
-
+       found = ahc_linux_pci_init();
+       if (!ahc_linux_eisa_init())
+               found++;
+       
        /*
         * Register with the SCSI layer all
         * controllers we've found.
@@ -908,7 +904,6 @@ ahc_linux_detect(Scsi_Host_Template *template)
                if (ahc_linux_register_host(ahc, template) == 0)
                        found++;
        }
-out:
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
        spin_lock_irq(&io_request_lock);