---

yaml --- r: 138481 b: refs/heads/master c: d523cc3 h: refs/heads/master i: 138479: 761cdf7 v: v3
git-mirror · Feb 23, 2009 · 5925d88 · 5925d88
1 parent 3604204
commit 5925d88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;