diff options
author | 2020-12-15 15:11:11 -0600 | |
---|---|---|
committer | 2020-12-15 15:11:11 -0600 | |
commit | 0032242459e72d92b997d983b0562b453fbf8fcf (patch) | |
tree | b9d195ff067afc23fa29ad91a94843c0ea9bafa8 | |
parent | Merge branch 'remotes/lorenzo/pci/aardvark' (diff) | |
parent | PCI: brcmstb: Initialize "tmp" before use (diff) | |
download | wireguard-linux-0032242459e72d92b997d983b0562b453fbf8fcf.tar.xz wireguard-linux-0032242459e72d92b997d983b0562b453fbf8fcf.zip |
Merge branch 'remotes/lorenzo/pci/brcmstb'
- Initialize "tmp" before use (Jim Quinlan)
* remotes/lorenzo/pci/brcmstb:
PCI: brcmstb: Initialize "tmp" before use
-rw-r--r-- | drivers/pci/controller/pcie-brcmstb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 7fc80fd6f13f..d41257f43a8f 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -881,6 +881,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) burst = 0x2; /* 512 bytes */ /* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */ + tmp = readl(base + PCIE_MISC_MISC_CTRL); u32p_replace_bits(&tmp, 1, PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK); u32p_replace_bits(&tmp, 1, PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK); u32p_replace_bits(&tmp, burst, PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK); |