From: Felix Fietkau Date: Sat, 10 Jul 2010 12:17:41 +0000 (+0000) Subject: brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9c8d55541aa7481b025d26401822a3a01ced19a5;p=openwrt%2Fstaging%2Fblocktrron.git brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35 SVN-Revision: 22116 --- diff --git a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch index d5ade16c70..8e1615f770 100644 --- a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch +++ b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch @@ -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"); diff --git a/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch index d5ade16c70..925197bc83 100644 --- a/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch +++ b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch @@ -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");