Skip to contentSkip to conversation

compile failure in drivers/isdn/hisax/diva.c

PATCH New Krishnakumar. R 1 participant 1 message Aug 8, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compile failure in drivers/isdn/hisax/diva.c

Hi John,

Here is the patch which will enable the compilation of the diva.c file.

The patch is against 2.6.0-test2.

Regards
KK

===========================================================
diffstat output:

diva.c | 22 +++++++++++-----------

1 files changed, 11 insertions(+), 11 deletions(-)

===========================================================

The following is the patch.

drivers/isdn/hisax/diva.c 2003-08-05 22:41:42.000000000 +0530 renamed from drivers/isdn/hisax/diva.orig.c 2003-08-05 22:22:04.000000000 +0530 +11 -11
@@ -751,24 +751,24 @@
                                        card->para[1] = pnp_port_start(pd, 0);
                                        card->para[0] = pnp_irq(pd, 0);
                                        if (pdev->function == ISAPNP_FUNCTION(0xA1)) {
-                                               if (diva_ipac_isa_probe(cs->card, cs))
+                                               if (diva_ipac_isa_probe(card->cs, card))
                                                        return 0;
                                                return 1;
                                        } else {
-                                               if (diva_isac_isa_probe(cs->card, cs))
+                                               if (diva_isac_isa_probe(card->cs, card))
                                                        return 0;
                                                return 1;
-                                       } else {
-                                               printk(KERN_ERR "Diva PnP: PnP error card found, no device\n");
-                                               return(0);
-                                       }
+                                       } 
+                               }else {
+                                       printk(KERN_ERR "Diva PnP: PnP error card found, no device\n");
+                                       return(0);
                                }
-                               pdev++;
-                               pnp_c=NULL;
-                       } 
-                       if (!pdev->card_vendor) {
-                               printk(KERN_INFO "Diva PnP: no ISAPnP card found\n");
                        }
+                       pdev++;
+                       pnp_c=NULL;
+               }
+               if (!pdev->card_vendor) {
+                       printk(KERN_INFO "Diva PnP: no ISAPnP card found\n");
                }
        }
 #endif