From 5925d8842a3be3523d5bf4f68a69ebaebebc443f Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Tue, 17 Feb 2009 00:18:49 +0000
Subject: [PATCH] --- yaml --- r: 138481 b: refs/heads/master c:
 d523cc379da57f1c39f5db9c47bdaa94f74727ff h: refs/heads/master i:   138479:
 761cdf78c7cb2bca76ba70949d639f0f1954bfb7 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/platforms/pseries/msi.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c50dd32f3052..b9c43a65ab8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620165f971753c2c451c880796bac7cd66f3534a
+refs/heads/master: d523cc379da57f1c39f5db9c47bdaa94f74727ff
diff --git a/trunk/arch/powerpc/platforms/pseries/msi.c b/trunk/arch/powerpc/platforms/pseries/msi.c
index 073b518338a3..081af6d7fa02 100644
--- a/trunk/arch/powerpc/platforms/pseries/msi.c
+++ b/trunk/arch/powerpc/platforms/pseries/msi.c
@@ -154,7 +154,11 @@ static int check_req(struct pci_dev *pdev, int nvec, char *prop_name)
 
 	if (*req_msi < nvec) {
 		pr_debug("rtas_msi: %s requests < %d MSIs\n", prop_name, nvec);
-		return -ENOSPC;
+
+		if (*req_msi == 0) /* Be paranoid */
+			return -ENOSPC;
+
+		return *req_msi;
 	}
 
 	return 0;