From: Jan Beulich <JBeulich@suse.com>
Date: Mon, 2 Apr 2012 14:22:39 +0000 (+0100)
Subject: xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success
X-Git-Tag: v2.6.39-400.9.0~543^2~21^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6300aa78aa6038ee857ca76ff1a0746b746578db;p=users%2Fjedix%2Flinux-maple.git

xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success

The original XenoLinux code has always had things this way, and for
compatibility reasons (in particular with a subsequent pciback
adjustment) upstream Linux should behave the same way (allowing for two
distinct error indications to be returned by the backend).

[upstream git commit f09d843]
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 373f8c753c00..59f5f3885614 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -290,6 +290,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
 		} else {
 			printk(KERN_DEBUG "enable msix get value %x\n",
 				op.value);
+			err = op.value;
 		}
 	} else {
 		dev_err(&dev->dev, "enable msix get err %x\n", err);