diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
| commit | c04ee7fcbfba1471af90cf6407370efc779c1243 (patch) | |
| tree | c0c37c40beb8bd197b7f424a67f12487960c4882 /drivers/pci/xen-pcifront.c | |
| parent | e0749524b57019f480ad6c581431589d053e0cb0 (diff) | |
| parent | 0f4a56e16d5fc9028b62ba529177a3109513e111 (diff) | |
Merge tag 'v3.10.2' into linux-linaro-lsklsk
This is the 3.10.2 stable release
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 966abc6054d..f7197a79034 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -678,10 +678,9 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev) if (!pcifront_dev) { dev_info(&pdev->xdev->dev, "Installing PCI frontend\n"); pcifront_dev = pdev; - } else { - dev_err(&pdev->xdev->dev, "PCI frontend already installed!\n"); + } else err = -EEXIST; - } + spin_unlock(&pcifront_dev_lock); if (!err && !swiotlb_nr_tbl()) { @@ -848,7 +847,7 @@ static int pcifront_try_connect(struct pcifront_device *pdev) goto out; err = pcifront_connect_and_init_dma(pdev); - if (err) { + if (err && err != -EEXIST) { xenbus_dev_fatal(pdev->xdev, err, "Error setting up PCI Frontend"); goto out; |