[LV-kern-commit] CVS: kernel-2.4/drivers/isdn/eicon common.c,1.2,1.3 eicon.h,1.2,1.3 eicon_dsp.h,1.2,1.3 eicon_idi.c,1.2,1.3 eicon_idi.h,1.2,1.3 eicon_io.c,1.2,1.3 eicon_isa.c,1.2,1.3 eicon_isa.h,1.2,1.3 eicon_mod.c,1.2,1.3 eicon_pci.c,1.2,1.3 eicon_pci.h,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/isdn/eicon

Modified Files:
	common.c eicon.h eicon_dsp.h eicon_idi.c eicon_idi.h 
	eicon_io.c eicon_isa.c eicon_isa.h eicon_mod.c eicon_pci.c 
	eicon_pci.h 
Log Message:
DA: sync with Marcelo 2.4.17


Index: common.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/common.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common.c	10 Apr 2002 15:32:23 -0000	1.2
+++ common.c	10 Jun 2003 01:13:36 -0000	1.3
@@ -808,7 +808,9 @@
 	
 	while(i--)
 	{
-		DivaDoCardDpc(card++);
+            if (card->state == DIA_RUNNING)
+		DivaDoCardDpc(card);
+            card++;
 	}
 }
 

Index: eicon.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_dsp.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_dsp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_idi.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_idi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_idi.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_idi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_isa.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_isa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_isa.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_isa.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_mod.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_mod.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eicon_mod.c	10 Apr 2002 15:32:23 -0000	1.2
+++ eicon_mod.c	10 Jun 2003 01:13:36 -0000	1.3
@@ -1550,7 +1550,7 @@
             	};
 	};
 	/* all adapter flavors checked without match, finito with:            */
-        return ENODEV;
+        return -ENODEV;
 };
 
 
@@ -1597,14 +1597,14 @@
 				membase = cards_membase;
 			} else {
 				if (membase != cards_membase)
-					return ENODEV;
+					return -ENODEV;
 			};
 			cards_irq=irq_array[((adf_pos0 & 0xC)>>2)];
 			if (irq == -1) { 
 				irq = cards_irq;
 			} else {
 				if (irq != cards_irq)
-					return ENODEV;
+					return -ENODEV;
 			};
 			cards_io= 0xC00 + ((adf_pos0>>4)*0x10);
 			type = EICON_CTYPE_ISAPRI; 
@@ -1616,14 +1616,14 @@
 				membase = cards_membase;
 			} else {
 				if (membase != cards_membase)
-					return ENODEV;
+					return -ENODEV;
 			};
 			cards_irq=irq_array[((adf_pos0 & 0xC)>>2)];
 			if (irq == -1) { 
 				irq = cards_irq;
 			} else {
 				if (irq != cards_irq)
-					return ENODEV;
+					return -ENODEV;
 			};
 
 			cards_io= 0xC00 + ((adf_pos0>>4)*0x10);
@@ -1637,12 +1637,12 @@
 				irq = cards_irq;
 			} else {
 				if (irq != cards_irq)
-					return ENODEV;
+					return -ENODEV;
 			};
 			type = 0; 
 			break;
 		default:
-			return  ENODEV;
+			return -ENODEV;
 	};
 	/* matching membase & irq */
 	if ( 1 == eicon_addcard(type, membase, irq, id, 0)) { 
@@ -1661,7 +1661,7 @@
 			cards->mca_slot+1);
 		return  0 ; /* eicon_addcard added a card */
 	} else {
-		return ENODEV;
+		return -ENODEV;
 	};
 };
 #endif /* CONFIG_MCA */

Index: eicon_pci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_pci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: eicon_pci.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/eicon/eicon_pci.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3