lkml.org 
[lkml]   [2018]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 119/144] iwlwifi: pcie: correctly define 7265-D cfg
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 2b0e2b0f7bfe9a9098bda6109176adcf78f9b7ac ]

    The trans cfg was not replaced for 7265-D cards. This led to a check of
    the min-NVM version against a 7265-C card, causing very-old 7265-D cards
    to operate incorrectly with the driver.

    Fixes: 3fd0d3c170ad ("iwlwifi: pcie: support 7265-D devices")
    Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/iwlwifi/pcie/drv.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
    index 8407ce5f672f..4c7be34219d7 100644
    --- a/drivers/net/wireless/iwlwifi/pcie/drv.c
    +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
    @@ -533,8 +533,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
    else if (cfg == &iwl7265_n_cfg)
    cfg_7265d = &iwl7265d_n_cfg;
    if (cfg_7265d &&
    - (iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)
    + (iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D) {
    cfg = cfg_7265d;
    + iwl_trans->cfg = cfg_7265d;
    + }
    #endif

    pci_set_drvdata(pdev, iwl_trans);
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-08 23:40    [W:4.143 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site