Merge "of/pci: fix sleeping from atomic context in pci_register_io_range()"

drivers/of/address.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -707,7 +707,7 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size)
		}

		/* add the range to the list */
		range = kzalloc(sizeof(*range), GFP_KERNEL);
		range = kzalloc(sizeof(*range), GFP_ATOMIC);
		if (!range) {
		err = -ENOMEM;
		goto end_register;