diff options
| author | Linus Torvalds | 2014-04-17 19:54:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-17 19:54:07 +0200 |
| commit | 88764e0a3ecf655950c4d46b323cf80e2e0ee481 (patch) | |
| tree | 395682bc8b0071ccf0124c5a7b952c0ca855fef7 /drivers/xen/xen-pciback/vpci.c | |
| parent | Merge tag '3.15-fixes' of git://neil.brown.name/md (diff) | |
| parent | xen/manage: Poweroff forcefully if user-space is not yet up. (diff) | |
| download | kernel-qcow2-linux-88764e0a3ecf655950c4d46b323cf80e2e0ee481.tar.gz kernel-qcow2-linux-88764e0a3ecf655950c4d46b323cf80e2e0ee481.tar.xz kernel-qcow2-linux-88764e0a3ecf655950c4d46b323cf80e2e0ee481.zip | |
Merge tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fixes from David Vrabel:
"Xen regression and bug fixes for 3.15-rc1:
- fix completely broken 32-bit PV guests caused by x86 refactoring
32-bit thread_info.
- only enable ticketlock slow path on Xen (not bare metal)
- fix two bugs with PV guests not shutting down when requested
- fix a minor memory leak in xen-pciback error path"
* tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/manage: Poweroff forcefully if user-space is not yet up.
xen/xenbus: Avoid synchronous wait on XenBus stalling shutdown/restart.
xen/spinlock: Don't enable them unconditionally.
xen-pciback: silence an unwanted debug printk
xen: fix memory leak in __xen_pcibk_add_pci_dev()
x86/xen: Fix 32-bit PV guests's usage of kernel_stack
Diffstat (limited to 'drivers/xen/xen-pciback/vpci.c')
| -rw-r--r-- | drivers/xen/xen-pciback/vpci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/xen-pciback/vpci.c b/drivers/xen/xen-pciback/vpci.c index 3165ce361b00..51afff96c515 100644 --- a/drivers/xen/xen-pciback/vpci.c +++ b/drivers/xen/xen-pciback/vpci.c @@ -137,6 +137,8 @@ unlock: /* Publish this device. */ if (!err) err = publish_cb(pdev, 0, 0, PCI_DEVFN(slot, func), devid); + else + kfree(dev_entry); out: return err; |