diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 11:53:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 11:53:45 +0100 |
| commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
| tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /drivers/pci/xen-pcifront.c | |
| parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index fd00ff02ab4..d6cc62cb4cf 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); |