Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / drivers / pci / iov.c

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index c18e5bf444faa693d41c6a9103ef7ab8982b07da..ee599f274f057ed54b2af74cd9c72afee3cb1fbe 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -33,7 +33,6 @@ static inline u8 virtfn_devfn(struct pci_dev *dev, int id)
 
 static struct pci_bus *virtfn_add_bus(struct pci_bus *bus, int busnr)
 {
-       int rc;
        struct pci_bus *child;
 
        if (bus->number == busnr)
@@ -48,12 +47,7 @@ static struct pci_bus *virtfn_add_bus(struct pci_bus *bus, int busnr)
                return NULL;
 
        pci_bus_insert_busn_res(child, busnr, busnr);
-       child->dev.parent = bus->bridge;
-       rc = pci_bus_add_child(child);
-       if (rc) {
-               pci_remove_bus(child);
-               return NULL;
-       }
+       bus->is_added = 1;
 
        return child;
 }
@@ -123,8 +117,6 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)
        virtfn->is_virtfn = 1;
 
        rc = pci_bus_add_device(virtfn);
-       if (rc)
-               goto failed1;
        sprintf(buf, "virtfn%u", id);
        rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);
        if (rc)