brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35
SVN-Revision: 22116
This commit is contained in:
parent
c788e49ab7
commit
9c8d55541a
2 changed files with 4 additions and 6 deletions
|
@ -1,11 +1,10 @@
|
||||||
--- a/drivers/net/b44.c
|
--- a/drivers/net/b44.c
|
||||||
+++ b/drivers/net/b44.c
|
+++ b/drivers/net/b44.c
|
||||||
@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp,
|
@@ -191,10 +190,11 @@ static int b44_wait_bit(struct b44 *bp,
|
||||||
break;
|
|
||||||
udelay(10);
|
udelay(10);
|
||||||
}
|
}
|
||||||
+#if 0
|
|
||||||
if (i == timeout) {
|
if (i == timeout) {
|
||||||
|
+#if 0
|
||||||
if (net_ratelimit())
|
if (net_ratelimit())
|
||||||
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
|
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
|
||||||
bit, reg, clear ? "clear" : "set");
|
bit, reg, clear ? "clear" : "set");
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
--- a/drivers/net/b44.c
|
--- a/drivers/net/b44.c
|
||||||
+++ b/drivers/net/b44.c
|
+++ b/drivers/net/b44.c
|
||||||
@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp,
|
@@ -191,10 +191,11 @@ static int b44_wait_bit(struct b44 *bp,
|
||||||
break;
|
|
||||||
udelay(10);
|
udelay(10);
|
||||||
}
|
}
|
||||||
+#if 0
|
|
||||||
if (i == timeout) {
|
if (i == timeout) {
|
||||||
|
+#if 0
|
||||||
if (net_ratelimit())
|
if (net_ratelimit())
|
||||||
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
|
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
|
||||||
bit, reg, clear ? "clear" : "set");
|
bit, reg, clear ? "clear" : "set");
|
||||||
|
|
Loading…
Reference in a new issue