lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 534/639] bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 420c20be08a4597404d272ae9793b642401146eb ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bcma/driver_pci.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
    index f499a469e66d0..12b2cc9a3fbe8 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)
    v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
    }

    - v = BCMA_CORE_PCI_MDIODATA_START;
    + v |= BCMA_CORE_PCI_MDIODATA_START;
    v |= BCMA_CORE_PCI_MDIODATA_READ;
    v |= BCMA_CORE_PCI_MDIODATA_TA;

    @@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device,
    v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
    }

    - v = BCMA_CORE_PCI_MDIODATA_START;
    + v |= BCMA_CORE_PCI_MDIODATA_START;
    v |= BCMA_CORE_PCI_MDIODATA_WRITE;
    v |= BCMA_CORE_PCI_MDIODATA_TA;
    v |= data;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:30    [W:3.155 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site