Re: BUG in modutils or drivers/isdn/hisax/

[Kai Germaschewski]

On Tue, 23 Jan 2001, Ingo Oeser wrote:

> To quote drivers/isdn/hisax/config.c:1710-1713
> static struct pci_device_id hisax_pci_tbl[] __initdata = {
> #ifdef CONFIG_HISAX_FRTIZPCI
>         {PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_FRITZ,       PCI_ANY_ID, PCI_ANY_ID},
> #endif
> 
> To quote my .config:
> CONFIG_ISDN_DRV_HISAX=m
> CONFIG_HISAX_FRITZPCI=y
> 
> So the bug is indeed in the driver and is a speling mistake
> Patch is:
> 
> --- linux/drivers/isdn/hisax/config.c.orig	Fri Dec 29 23:07:22 2000
> +++ linux/drivers/isdn/hisax/config.c	Tue Jan 23 15:07:54 2001
> @@ -1708,8 +1708,8 @@
>  }
>  
>  static struct pci_device_id hisax_pci_tbl[] __initdata = {
> -#ifdef CONFIG_HISAX_FRTIZPCI
> -	{PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_FRITZ,        PCI_ANY_ID, PCI_ANY_ID},
> +#ifdef CONFIG_HISAX_FRITZPCI
> +	{PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_FRITZ,	PCI_ANY_ID, PCI_ANY_ID},
>  #endif
>  #ifdef CONFIG_HISAX_DIEHLDIVA
>  	{PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA20,     PCI_ANY_ID, PCI_ANY_ID},
> 

Close, but not quite. (Try compiling after your patch :)

Correct patch:

--- linux-2.4.0/drivers/isdn/hisax/config.c	Fri Dec 29 23:07:22 2000
+++ linux-2.4.1-pre10.work/drivers/isdn/hisax/config.c	Tue Jan 23 11:23:54 2001
@@ -1708,8 +1708,8 @@
 }
 
 static struct pci_device_id hisax_pci_tbl[] __initdata = {
-#ifdef CONFIG_HISAX_FRTIZPCI
-	{PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_FRITZ,        PCI_ANY_ID, PCI_ANY_ID},
+#ifdef CONFIG_HISAX_FRITZPCI
+	{PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_A1,          PCI_ANY_ID, PCI_ANY_ID},
 #endif
 #ifdef CONFIG_HISAX_DIEHLDIVA
 	{PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA20,     PCI_ANY_ID, PCI_ANY_ID},