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

Unverified Commit 8fd2d6ea authored by Joshua Kinard's avatar Joshua Kinard Committed by Paul Burton
Browse files

MIPS: Use !pci_is_root_bus(bus) in ops-bridge.c 



This is a manual cherrypick of commit c7ddc3d137b7 from Alastair
Bridgewater's IP35 tree that replaces two cases of
"if (bus->number > 0)" with a more correct "if (!pci_is_root_bus(bus))"
in arch/mips/pci/ops-bridge.c.

Cc: linux-mips@linux-mips.org
Cc: Alastair Bridgewater <alastair.bridgewater@gmail.com>
Suggested-by: default avatarAlastair Bridgewater <alastair.bridgewater@gmail.com>
Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
Patchwork: https://patchwork.linux-mips.org/patch/17501/


Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Linux/MIPS <linux-mips@linux-mips.org>
parent 8c8d953c

arch/mips/pci/ops-bridge.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int pci_conf1_read_config(struct pci_bus *bus, unsigned int devfn, 
static int pci_read_config(struct pci_bus *bus, unsigned int devfn,

			   int where, int size, u32 * value)

{

	if (bus->number > 0)

	if (!pci_is_root_bus(bus))

		return pci_conf1_read_config(bus, devfn, where, size, value);



	return pci_conf0_read_config(bus, devfn, where, size, value);
@@ -310,7 +310,7 @@ static int pci_conf1_write_config(struct pci_bus *bus, unsigned int devfn, 
static int pci_write_config(struct pci_bus *bus, unsigned int devfn,

	int where, int size, u32 value)

{

	if (bus->number > 0)

	if (!pci_is_root_bus(bus))

		return pci_conf1_write_config(bus, devfn, where, size, value);



	return pci_conf0_write_config(bus, devfn, where, size, value);