From 17137e44db7d42d810ca3ec99986e4b1b95cbad1 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 5 Aug 2010 10:28:31 +0000
Subject: [PATCH] --- yaml --- r: 213795 b: refs/heads/master c:
 9e1634a734bdd2dac5687f57dd427bef083e4659 h: refs/heads/master i:   213793:
 cbb4e5febb2ec187030658d5cdbda0fe6e0a4aaa   213791:
 f4b46c9f9e16ced2808771a279cee627f0666f00 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/cpmac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d72ee40a373f..c4a0d48ac425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f1d47ef4779fb45e8cccde6f31c76c3cdabbec1
+refs/heads/master: 9e1634a734bdd2dac5687f57dd427bef083e4659
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index e1f6156b3710..ac3985ceb5f7 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -506,7 +506,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget)
 					"restart rx from a descriptor that's "
 					"not free: %p\n",
 					priv->dev->name, restart);
-				goto fatal_error;
+			goto fatal_error;
 		}
 
 		cpmac_write(priv->regs, CPMAC_RX_PTR(0), restart->mapping);