Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[mirror_ubuntu-artful-kernel.git] / drivers / of / of_pci.c

diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index d0c8902dfbf4c564cf50af70b5b6cbb6798905c5..ff27177f49edbdd3105b319c7deee29ed48da869 100644 (file)
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -249,8 +249,10 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
                }
 
                err = of_pci_range_to_resource(&range, dev, res);
-               if (err)
-                       goto conversion_failed;
+               if (err) {
+                       kfree(res);
+                       continue;
+               }
 
                if (resource_type(res) == IORESOURCE_IO) {
                        if (!io_base) {