From b33ddbcdc0027ad712f0856c9cb82181a0da06fd Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@ge.com>
Date: Tue, 29 Nov 2011 13:28:05 +0000
Subject: [PATCH] --- yaml --- r: 281185 b: refs/heads/master c:
 c1fcc4c9bd50d2d29bfaeb888af7de246343235d h: refs/heads/master i:   281183:
 d4784d4c86671f0a30e1d3c43decd88c12e49f21 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/vme/devices/vme_pio2_gpio.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5e4264dbdf7f..9974fe8510b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3ff1cc99eb869af040e34c0bbe3035cc5c203b
+refs/heads/master: c1fcc4c9bd50d2d29bfaeb888af7de246343235d
diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c b/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c
index 2ac88ad17042..dc837deb99dd 100644
--- a/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -159,9 +159,14 @@ int pio2_gpio_reset(struct pio2_card *card)
 	}
 
 	/* Set input interrupt masks */
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < 4; i++) {
+		retval = vme_master_write(card->window, &data, 1,
+			PIO2_REGS_INT_MASK[i * 2]);
+		if (retval < 0)
+			return retval;
+
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[i]);
+			PIO2_REGS_INT_MASK[(i * 2) + 1]);
 		if (retval < 0)
 			return retval;