Commit 84e0e727 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/enumeration' 

  - Fix Broadcom CNB20LE host bridge unintended sign extension (Colin Ian
    King)

* pci/enumeration:
  x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
parents 2caa4dc6 53bb565f

arch/x86/pci/broadcom_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) 
	word1 = read_pci_config_16(bus, slot, func, 0xc0);

	word2 = read_pci_config_16(bus, slot, func, 0xc2);

	if (word1 != word2) {

		res.start = (word1 << 16) | 0x0000;

		res.end   = (word2 << 16) | 0xffff;

		res.start = ((resource_size_t) word1 << 16) | 0x0000;

		res.end   = ((resource_size_t) word2 << 16) | 0xffff;

		res.flags = IORESOURCE_MEM;

		update_res(info, res.start, res.end, res.flags, 0);

	}