diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 15:31:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 15:31:02 -0600 |
| commit | 84e0e72722098c7ced6362d1219c2a40a9d109fa (patch) | |
| tree | 48d23d4cebdd413e1a368c11a56bb6c2e5c030e2 | |
| parent | 2caa4dc607a7025ab40c5bf9c2e2b0dae99ad09a (diff) | |
| parent | 53bb565fc5439f2c8c57a786feea5946804aa3e9 (diff) | |
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)
| -rw-r--r-- | arch/x86/pci/broadcom_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c index 526536c81ddc..ca1e8e6dccc8 100644 --- a/arch/x86/pci/broadcom_bus.c +++ b/arch/x86/pci/broadcom_bus.c @@ -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); } |