diff options
author | Colin Ian King <colin.king@canonical.com> | 2019-08-27 04:16:20 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2019-09-03 09:44:02 -0400 |
commit | 420c20be08a4597404d272ae9793b642401146eb (patch) | |
tree | 35ed2a7fe182aeec9568b28d44eca54001522b5c | |
parent | 5f42b382ead278c1f6c3854765c97eb20491aa2a (diff) |
bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
An earlier commit re-worked the setting of the bitmask and is now
assigning v with some bit flags rather than bitwise or-ing them
into v, consequently the earlier bit-settings of v are being lost.
Fix this by replacing an assignment with the bitwise or instead.
Addresses-Coverity: ("Unused value")
Fixes: 2be25cac8402 ("bcma: add constants for PCI and use them")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r-- | drivers/bcma/driver_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c index f499a469e66d..12b2cc9a3fbe 100644 --- a/drivers/bcma/driver_pci.c +++ b/drivers/bcma/driver_pci.c | |||
@@ -78,7 +78,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address) | |||
78 | v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); | 78 | v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); |
79 | } | 79 | } |
80 | 80 | ||
81 | v = BCMA_CORE_PCI_MDIODATA_START; | 81 | v |= BCMA_CORE_PCI_MDIODATA_START; |
82 | v |= BCMA_CORE_PCI_MDIODATA_READ; | 82 | v |= BCMA_CORE_PCI_MDIODATA_READ; |
83 | v |= BCMA_CORE_PCI_MDIODATA_TA; | 83 | v |= BCMA_CORE_PCI_MDIODATA_TA; |
84 | 84 | ||
@@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device, | |||
121 | v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); | 121 | v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); |
122 | } | 122 | } |
123 | 123 | ||
124 | v = BCMA_CORE_PCI_MDIODATA_START; | 124 | v |= BCMA_CORE_PCI_MDIODATA_START; |
125 | v |= BCMA_CORE_PCI_MDIODATA_WRITE; | 125 | v |= BCMA_CORE_PCI_MDIODATA_WRITE; |
126 | v |= BCMA_CORE_PCI_MDIODATA_TA; | 126 | v |= BCMA_CORE_PCI_MDIODATA_TA; |
127 | v |= data; | 127 | v |= data; |