Merge tag 'mac80211-for-davem-2014-12-18' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / drivers / xen / xen-pciback / xenbus.c

diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index ad8d30c..fe17c80 100644 (file)
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -247,7 +247,7 @@ static int xen_pcibk_export_device(struct xen_pcibk_device *pdev,
        if (err)
                goto out;
 
-       dev_dbg(&dev->dev, "registering for %d\n", pdev->xdev->otherend_id);
+       dev_info(&dev->dev, "registering for %d\n", pdev->xdev->otherend_id);
        if (xen_register_device_domain_owner(dev,
                                             pdev->xdev->otherend_id) != 0) {
                dev_err(&dev->dev, "Stealing ownership from dom%d.\n",
@@ -291,7 +291,7 @@ static int xen_pcibk_remove_device(struct xen_pcibk_device *pdev,
 
        /* N.B. This ends up calling pcistub_put_pci_dev which ends up
         * doing the FLR. */
-       xen_pcibk_release_pci_dev(pdev, dev);
+       xen_pcibk_release_pci_dev(pdev, dev, true /* use the lock. */);
 
 out:
        return err;