Jure Pe?ar <[EMAIL PROTECTED]> wrote: > > Error: ./drivers/scsi/aic7xxx/aic7xxx_osm.o .init.text refers to > 0000000000000040 ELF_LITERAL .exit.text > Error: ./drivers/scsi/aic7xxx/aic7xxx_osm.o .init.text refers to > 0000000000000044 HINT .exit.text > Error: ./drivers/scsi/aic7xxx/aic7xxx_osm.o .eh_frame refers to > 0000000000000941 SREL32 .exit.text
That was my fault. This patch should fix it. Cheers, -- Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ ) Email: Herbert Xu ~{PmV>HI~} <[EMAIL PROTECTED]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- Index: drivers/scsi/aic7xxx/aic7xxx_osm.c =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/drivers/scsi/aic7xxx/aic7xxx_osm.c,v retrieving revision 1.5 diff -u -r1.5 aic7xxx_osm.c --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c 3 Apr 2004 10:13:36 -0000 1.5 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c 23 Apr 2004 10:15:57 -0000 @@ -891,21 +891,14 @@ */ ahc_list_lockinit(); -#ifdef CONFIG_PCI found = ahc_linux_pci_init(); if (found) - goto out; -#endif + goto pci_err; -#ifdef CONFIG_EISA found = ahc_linux_eisa_init(); if (found) { -#ifdef CONFIG_PCI - ahc_linux_pci_exit(); -#endif - goto out; + goto eisa_err; } -#endif /* * Register with the SCSI layer all @@ -921,7 +914,15 @@ #endif aic7xxx_detect_complete++; -out: + if (!found) { + found = -ENODEV; + + ahc_linux_eisa_exit(); +eisa_err: + ahc_linux_pci_exit(); + } + +pci_err: return (found); } @@ -5088,11 +5089,7 @@ ahc_linux_init(void) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - int rc = ahc_linux_detect(&aic7xxx_driver_template); - if (rc) - return rc; - ahc_linux_exit(); - return -ENODEV; + return ahc_linux_detect(&aic7xxx_driver_template); #else scsi_register_module(MODULE_SCSI_HA, &aic7xxx_driver_template); if (aic7xxx_driver_template.present == 0) { @@ -5132,12 +5129,8 @@ */ scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template); #endif -#ifdef CONFIG_PCI ahc_linux_pci_exit(); -#endif -#ifdef CONFIG_EISA ahc_linux_eisa_exit(); -#endif } module_init(ahc_linux_init); Index: drivers/scsi/aic7xxx/aic7xxx_osm.h =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/drivers/scsi/aic7xxx/aic7xxx_osm.h,v retrieving revision 1.2 diff -u -r1.2 aic7xxx_osm.h --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h 3 Apr 2004 09:26:57 -0000 1.2 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h 23 Apr 2004 10:12:43 -0000 @@ -845,6 +845,9 @@ int aic7770_map_registers(struct ahc_softc *ahc, u_int port); int aic7770_map_int(struct ahc_softc *ahc, u_int irq); +#else +static __inline int ahc_linux_eisa_init(void) { return 0; } +static __inline void ahc_linux_eisa_exit(void) {} #endif /******************************* PCI Routines *********************************/ @@ -960,6 +963,9 @@ */ #define ahc_pci_set_dma_mask(dev_softc, mask) \ (((dev_softc)->dma_mask = mask) && 0) + +static __inline int ahc_linux_pci_init(void) { return 0; } +static __inline void ahc_linux_pci_exit(void) {} #endif /**************************** Proc FS Support *********************************/ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
