brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 10 Jul 2010 12:17:41 +0000 (12:17 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 10 Jul 2010 12:17:41 +0000 (12:17 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22116 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch

index d5ade16..8e1615f 100644 (file)
@@ -1,11 +1,10 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp, 
-                       break;
+@@ -191,10 +190,11 @@ static int b44_wait_bit(struct b44 *bp, 
                udelay(10);
        }
-+#if 0
        if (i == timeout) {
++#if 0
                if (net_ratelimit())
                        netdev_err(bp->dev, "BUG!  Timeout waiting for bit %08x of register %lx to %s\n",
                                   bit, reg, clear ? "clear" : "set");
index d5ade16..925197b 100644 (file)
@@ -1,11 +1,10 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp, 
-                       break;
+@@ -191,10 +191,11 @@ static int b44_wait_bit(struct b44 *bp, 
                udelay(10);
        }
-+#if 0
        if (i == timeout) {
++#if 0
                if (net_ratelimit())
                        netdev_err(bp->dev, "BUG!  Timeout waiting for bit %08x of register %lx to %s\n",
                                   bit, reg, clear ? "clear" : "set");