diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:43 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:43 -0500 |
commit | 673525c5c2dad113da585c657af5cc501ef6d9d7 (patch) | |
tree | 0b7410f30e8146a20382b943125dae76235cc01e /drivers/pci | |
parent | bac9789e535a6353854e19532d1db3d5580cb58c (diff) | |
parent | c577f4a5a08bb9677e12ddafb62e2f3a901de87f (diff) | |
download | linux-673525c5c2dad113da585c657af5cc501ef6d9d7.tar.bz2 |
Merge branch 'remotes/lorenzo/pci/rockchip'
- Fix rockchip bitwise operations that overflow type (Colin Ian King)
* remotes/lorenzo/pci/rockchip:
PCI: rockchip: Fix rockchip_pcie_ep_assert_intx() bitwise operations
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/controller/pcie-rockchip-ep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c index a5d799e2dff2..d743b0a48988 100644 --- a/drivers/pci/controller/pcie-rockchip-ep.c +++ b/drivers/pci/controller/pcie-rockchip-ep.c @@ -350,7 +350,7 @@ static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn, struct rockchip_pcie *rockchip = &ep->rockchip; u32 r = ep->max_regions - 1; u32 offset; - u16 status; + u32 status; u8 msg_code; if (unlikely(ep->irq_pci_addr != ROCKCHIP_PCIE_EP_PCI_LEGACY_IRQ_ADDR || |