From 192d728b41f1c0798afeaf647038f4e493ac9c9c Mon Sep 17 00:00:00 2001
From: Joachim Eastwood <manabian@gmail.com>
Date: Mon, 22 Oct 2012 08:45:31 +0000
Subject: [PATCH] --- yaml --- r: 340431 b: refs/heads/master c:
 95ebcea69c888fc644e2a64586c74e2299ca47ca h: refs/heads/master i:   340429:
 56589d48ef504563bd0259d15af28c629a40190e   340427:
 a330c5945cdb26b91f2582aae52ff1a2413d22a5   340423:
 b5adb552f081fc7d61f3dea0c9397e9ab02ec86d   340415:
 a5e7aac9d66906b9318e536617ba29d3674120ce v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/ethernet/cadence/macb.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index decf811401d4..ccf2bd2f8442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ebd3181572af8d5076808dab2682d800f6da5d
+refs/heads/master: 95ebcea69c888fc644e2a64586c74e2299ca47ca
diff --git a/trunk/drivers/net/ethernet/cadence/macb.c b/trunk/drivers/net/ethernet/cadence/macb.c
index 6c84a1104aff..6a4f4998cfe5 100644
--- a/trunk/drivers/net/ethernet/cadence/macb.c
+++ b/trunk/drivers/net/ethernet/cadence/macb.c
@@ -553,7 +553,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
 	while (status) {
 		/* close possible race with dev_close */
 		if (unlikely(!netif_running(dev))) {
-			macb_writel(bp, IDR, ~0UL);
+			macb_writel(bp, IDR, -1);
 			break;
 		}
 
@@ -789,11 +789,11 @@ static void macb_reset_hw(struct macb *bp)
 	macb_writel(bp, NCR, MACB_BIT(CLRSTAT));
 
 	/* Clear all status flags */
-	macb_writel(bp, TSR, ~0UL);
-	macb_writel(bp, RSR, ~0UL);
+	macb_writel(bp, TSR, -1);
+	macb_writel(bp, RSR, -1);
 
 	/* Disable all interrupts */
-	macb_writel(bp, IDR, ~0UL);
+	macb_writel(bp, IDR, -1);
 	macb_readl(bp, ISR);
 }