Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / pci / controller / pci-hyperv.c

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 9c93ac2..0ca73c8 100644 (file)
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -2820,6 +2820,7 @@ static int hv_pci_probe(struct hv_device *hdev,
                        const struct hv_vmbus_device_id *dev_id)
 {
        struct hv_pcibus_device *hbus;
+       char *name;
        int ret;
 
        /*
@@ -2888,7 +2889,14 @@ static int hv_pci_probe(struct hv_device *hdev,
                goto free_config;
        }
 
-       hbus->sysdata.fwnode = irq_domain_alloc_fwnode(hbus);
+       name = kasprintf(GFP_KERNEL, "%pUL", &hdev->dev_instance);
+       if (!name) {
+               ret = -ENOMEM;
+               goto unmap;
+       }
+
+       hbus->sysdata.fwnode = irq_domain_alloc_named_fwnode(name);
+       kfree(name);
        if (!hbus->sysdata.fwnode) {
                ret = -ENOMEM;
                goto unmap;