From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 30 Dec 2008 02:42:33 +0000 (-0800)
Subject: EtherExpress16: fix printing timed out status
X-Git-Tag: v2.6.29-rc1~557^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=684f4a4c4a69f7226d8c7559c0cdfc7bd388335a;p=pandora-kernel.git

EtherExpress16: fix printing timed out status

in drivers/net/eexpress.c:558, function unstick_cu()

while (!SCB_complete(rsst=scb_status(dev))) {
	...
	if (...)
		printk(KERN_WARNING "%s: Reset timed out status %04x, retrying...\n",
                                                       dev->name,rsst);
}

but this will become

while (!((rsst = scb_status(dev) & 0x8000) != 0) ...

because of the macro:

#define SCB_complete(s) ((s&0x8000)!=0)

so rsst can only become either 0x8000 or 0, but in the latter case the
loop ends, I think the wrong timed out status is printed. This also
cleans up similar macros.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed