Re: 2.6.3 oops at kobject_unregister, alsa & aic7xxx

[Eric Kerin <eric@bootseg.com>]

On Tue, 2004-02-24 at 02:32, Andrew Morton wrote:
> Eric Kerin <eric@bootseg.com> wrote:
> >  There's a 2nd patch in the above thread that changes those modules to
> >  stay loaded even if no devices are found, which Arjan V pointed out was
> >  the preferred way for drivers to work.
> 
> Sounds good.  Do you have that patch handy?
> -

Sure do, 

Below are the patches I coded up for the aic7xxx and aic79xx drivers
that leave the module loaded.

Eric Kerin


--- aic7xxx_osm.c.original      2004-01-02 03:56:32.000000000 -0500
+++ aic7xxx_osm.c       2004-01-03 05:03:41.000000000 -0500
@@ -844,6 +844,7 @@ ahc_linux_detect(Scsi_Host_Template *tem
 {
        struct  ahc_softc *ahc;
        int     found;
+       int     pci_reg_state;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
        /*
@@ -891,8 +892,9 @@ ahc_linux_detect(Scsi_Host_Template *tem
         */
        ahc_list_lockinit();
 
+       pci_reg_state = -1;
 #ifdef CONFIG_PCI
-       ahc_linux_pci_init();
+       pci_reg_state = ahc_linux_pci_init();
 #endif
 
 #ifdef CONFIG_EISA
@@ -913,6 +915,10 @@ ahc_linux_detect(Scsi_Host_Template *tem
        spin_lock_irq(&io_request_lock);
 #endif
        aic7xxx_detect_complete++;
+       if(pci_reg_state == 0 && found == 0){
+               return(1); 
+       }
+
        return (found);
 }
 


--- aic79xx_osm.c.original      2004-01-02 02:46:43.000000000 -0500
+++ aic79xx_osm.c       2004-01-03 05:05:52.000000000 -0500
@@ -856,6 +856,7 @@ ahd_linux_detect(Scsi_Host_Template *tem
 {
        struct  ahd_softc *ahd;
        int     found;
+       int     pci_reg_state;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
        /*
@@ -906,8 +907,9 @@ ahd_linux_detect(Scsi_Host_Template *tem
         */
        ahd_list_lockinit();
 
+       pci_reg_state = -1;
 #ifdef CONFIG_PCI
-       ahd_linux_pci_init();
+       pci_reg_state = ahd_linux_pci_init();
 #endif
 
        /*
@@ -924,6 +926,10 @@ ahd_linux_detect(Scsi_Host_Template *tem
        spin_lock_irq(&io_request_lock);
 #endif
        aic79xx_detect_complete++;
+       if(pci_reg_state == 0 && found == 0){
+               return(1); 
+       }
+
        return (found);
 }