Merging error in eeprom.c

Message ID 20011001124059.A21644@gondor.apana.org.au
State New, archived
Headers show
Series
  • Merging error in eeprom.c
Related show

Commit Message

Herbert Xu Oct. 1, 2001, 2:40 a.m. UTC
This patch fixes an error made presumably while merging from Donald Becker's
driver.

Patch

Index: drivers/net/tulip/eeprom.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/drivers/net/tulip/eeprom.c,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 eeprom.c
--- drivers/net/tulip/eeprom.c	16 May 2001 17:25:39 -0000	1.1.1.6
+++ drivers/net/tulip/eeprom.c	1 Oct 2001 01:29:02 -0000
@@ -148,10 +148,10 @@ 
 		for (i = 0; i < count; i++) {
 			unsigned char media_block = *p++;
 			int media_code = media_block & MEDIA_MASK;
-			if (media_code & 0x40)
+			if (media_block & 0x40)
 				p += 6;
 			printk(KERN_INFO "%s:  21041 media #%d, %s.\n",
-				   dev->name, media_code & 15, medianame[media_code & 15]);
+				   dev->name, media_code, medianame[media_code]);
 		}
 	} else {
 		unsigned char *p = (void *)ee_data + ee_data[27];