From 43f22b636849a68c6ad20e877a3f74eaa80e49c1 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 26 May 2010 17:59:11 +0200
Subject: [PATCH] --- yaml --- r: 205635 b: refs/heads/master c:
 7c0ace54887872ebd99fefdfe85d273295a09426 h: refs/heads/master i:   205633:
 ebc38df4cc2501f7b2e5f7419fcb706a983f41bc   205631:
 ac8b4be664273a14a9bbc5c641e72719e388ecca v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/vme/bridges/vme_ca91cx42.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2eb861c391bf..91b8530f8145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f9f018967c3fc112a03a99a8fdfad3621407a7
+refs/heads/master: 7c0ace54887872ebd99fefdfe85d273295a09426
diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
index 0f9ea58ff717..16cf53e38a74 100644
--- a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -900,7 +900,8 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
 	/* Address must be 4-byte aligned */
 	if (pci_addr & 0x3) {
 		dev_err(dev, "RMW Address not 4-byte aligned\n");
-		return -EINVAL;
+		result = -EINVAL;
+		goto out;
 	}
 
 	/* Ensure RMW Disabled whilst configuring */
@@ -921,6 +922,7 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
 	/* Disable RMW */
 	iowrite32(0, bridge->base + SCYC_CTL);
 
+out:
 	spin_unlock(&(image->lock));
 
 	mutex_unlock(&(bridge->vme_rmw));