Messages in this thread Patch in this message |  | | Date | Mon, 1 Oct 2001 12:40:59 +1000 | Subject | [PATCH] Merging error in eeprom.c | From | Herbert Xu <> |
| |
This patch fixes an error made presumably while merging from Donald Becker's driver. -- Debian GNU/Linux 2.2 is out! ( http://www.debian.org/ ) Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt 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]; |  |