]> err.no Git - linux-2.6/commitdiff
[PATCH] 8139cp: fix eeprom read command length
authorPhilip Craig <philipc@snapgear.com>
Wed, 21 Jun 2006 01:33:26 +0000 (11:33 +1000)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 03:20:29 +0000 (23:20 -0400)
The read command for the 93C46/93C56 EEPROMS should be 3 bits plus
the address.  This doesn't appear to affect the operation of the
read command, but similar errors for write commands do cause failures.

Signed-off-by: Philip Craig <philipc@snapgear.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/8139cp.c

index 46d8c01437e929080703eaf88e617cde75f0106b..b49be8f2c10798780f41895bb909aad35289c83f 100644 (file)
@@ -1628,7 +1628,7 @@ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)
        eeprom_delay ();
 
        /* Shift the read command bits out. */
-       for (i = 4 + addr_len; i >= 0; i--) {
+       for (i = 3 + addr_len - 1; i >= 0; i--) {
                int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
                writeb (EE_ENB | dataval, ee_addr);
                eeprom_delay ();