patch-2.2.15 linux/drivers/net/comx-hw-mixcom.c

• Lines: 40
• Date: Fri Apr 21 12:46:16 2000
• Orig file: v2.2.14/drivers/net/comx-hw-mixcom.c
• Orig date: Tue Jan 4 21:18:51 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/net/comx-hw-mixcom.c linux/drivers/net/comx-hw-mixcom.c
@@ -26,9 +26,12 @@
  *
  * Version 0.63 (99/09/21):
  *		- line status report fixes
+ *
+ * Version 0.64 (99/12/01):
+ *		- some more cosmetical fixes
  */
 
-#define VERSION "0.63"
+#define VERSION "0.64"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -167,7 +170,7 @@
 
 	save_flags(flags); cli();
 
-	id=inb_p(MIXCOM_BOARD_BASE(dev) + MIXCOM_ID_OFFSET);
+	id=inb_p(MIXCOM_BOARD_BASE(dev) + MIXCOM_ID_OFFSET) & 0x7f;
 
  	if (id != MIXCOM_ID ) {
 		ret=-ENODEV;
@@ -522,7 +525,6 @@
 
 	mixcom_on(dev);
 
-	restore_flags(flags);
 
 	hw->status=inb(MIXCOM_BOARD_BASE(dev) + MIXCOM_STATUS_OFFSET);
 	if(hw->status != 0xff) {
@@ -538,6 +540,8 @@
 	} else {
 		ch->line_status &= ~LINE_UP;
 	}
+
+	restore_flags(flags);
 
 	ch->LINE_status(dev, ch->line_status);