Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a48a687d authored by Changbin Du's avatar Changbin Du Committed by Bjorn Helgaas
Browse files

PCI: Move pci_map_rom() error path 



Move pci_map_rom() error code to the end to prepare for adding another
error path.  No functional change intended.

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
[bhelgaas: split non-functional change into separate patch]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent fa564ad9

drivers/pci/rom.c

+8 −6
Original line number Diff line number Diff line
@@ -147,12 +147,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
		return NULL;



	rom = ioremap(start, *size);

	if (!rom) {

		/* restore enable if ioremap fails */

		if (!(res->flags & IORESOURCE_ROM_ENABLE))

			pci_disable_rom(pdev);

		return NULL;

	}

	if (!rom)

		goto err_ioremap;



	/*

	 * Try to find the true size of the ROM since sometimes the PCI window
@@ -161,6 +157,12 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
	 */

	*size = pci_get_rom_size(pdev, rom, *size);

	return rom;



err_ioremap:

	/* restore enable if ioremap fails */

	if (!(res->flags & IORESOURCE_ROM_ENABLE))

		pci_disable_rom(pdev);

	return NULL;

}

EXPORT_SYMBOL(pci_map_rom);