aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/xen-pcifront.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 966abc6054d7..f7197a790341 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)
678 if (!pcifront_dev) { 678 if (!pcifront_dev) {
679 dev_info(&pdev->xdev->dev, "Installing PCI frontend\n"); 679 dev_info(&pdev->xdev->dev, "Installing PCI frontend\n");
680 pcifront_dev = pdev; 680 pcifront_dev = pdev;
681 } else { 681 } else
682 dev_err(&pdev->xdev->dev, "PCI frontend already installed!\n");
683 err = -EEXIST; 682 err = -EEXIST;
684 } 683
685 spin_unlock(&pcifront_dev_lock); 684 spin_unlock(&pcifront_dev_lock);
686 685
687 if (!err && !swiotlb_nr_tbl()) { 686 if (!err && !swiotlb_nr_tbl()) {
@@ -848,7 +847,7 @@ static int pcifront_try_connect(struct pcifront_device *pdev)
848 goto out; 847 goto out;
849 848
850 err = pcifront_connect_and_init_dma(pdev); 849 err = pcifront_connect_and_init_dma(pdev);
851 if (err) { 850 if (err && err != -EEXIST) {
852 xenbus_dev_fatal(pdev->xdev, err, 851 xenbus_dev_fatal(pdev->xdev, err,
853 "Error setting up PCI Frontend"); 852 "Error setting up PCI Frontend");
854 goto out; 853 goto out;