Merge remote-tracking branch 'berlin/berlin/for-next'

[karo-tx-linux.git] / drivers / edac / i82875p_edac.c

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 8d0450b9b9af42e5b4db08ab68b94f44a971a0ae..64b68320249f0e5e05db5ef8a0eccc0a2925dade 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -275,7 +275,6 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 {
        struct pci_dev *dev;
        void __iomem *window;
-       int err;
 
        *ovrfl_pdev = NULL;
        *ovrfl_window = NULL;
@@ -293,13 +292,8 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                if (dev == NULL)
                        return 1;
 
-               err = pci_bus_add_device(dev);
-               if (err) {
-                       i82875p_printk(KERN_ERR,
-                               "%s(): pci_bus_add_device() Failed\n",
-                               __func__);
-               }
                pci_bus_assign_resources(dev->bus);
+               pci_bus_add_device(dev);
        }
 
        *ovrfl_pdev = dev;