From patchwork Mon Jan 15 17:10:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10164873 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A75C8602C2 for ; Mon, 15 Jan 2018 17:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90137203B9 for ; Mon, 15 Jan 2018 17:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84AE220415; Mon, 15 Jan 2018 17:11:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11245203B9 for ; Mon, 15 Jan 2018 17:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966051AbeAORLA (ORCPT ); Mon, 15 Jan 2018 12:11:00 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34910 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965968AbeAORK6 (ORCPT ); Mon, 15 Jan 2018 12:10:58 -0500 Received: by mail-pg0-f67.google.com with SMTP id d6so8256741pgv.2 for ; Mon, 15 Jan 2018 09:10:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=LJLnC3lKJixRy6rwnYKVbHY/Iwy8TDZkxK1BXRklM/A=; b=COU5f3hl44gMfSONRJiXEOWynQZtpwGAFIsbuP2BdbMMpbcv2lEzYCp1BnZ29bjxXS +weQ8U4gouD6+SJHpHk+R0Lu3msQvvEs7337AQUAvs9bSprC0Lz+AY67dKZkA85m57iX f3cqMluf8KsxqavJ4RMIrXN4/icrmQuBT9x+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LJLnC3lKJixRy6rwnYKVbHY/Iwy8TDZkxK1BXRklM/A=; b=FxpMCo37A9PfjJuys8ycHTsdgOmj6Ox6gIBpzDRX0PxVoUbJUxSc4l+StJEsmFDD96 aRFlwPyGVyF19nTzq94g7XCFuP/SFaEcXeGjuTcxUPTWnun6rp6NnT3dv7YAfPBa1VVG Nj8gOEVqxL3LLajjVerRgnkg0/MQzLP0EYiTou2b5hvOiyi0EYHYSro262Z+86uWKd8D Ta1yjR2h/k6fHCfEdSkUPOctRURulzFWnGLNDtQSDd21qgqT10vgVRc+tivoXu+p5T3y yAFjJ3Ej9MNcJf+wO3jeldUuvMuJcHKVULY9i1cU4OrfnGWRbqE1kT2Fc+kldEAe6wE5 FX3g== X-Gm-Message-State: AKGB3mKkPgMpamOPdpg7vMZxOuig82g61Wbke6Pey0gKHhBpenOoahQp jPRpfhWjfIF5M1QOwVtvdnFyQw== X-Google-Smtp-Source: ACJfBov+ClWXgJLuipR3yeR+KamUJJj763x0MAcK+IQiWQMy6DtAn/1n8R/CXrHK+xurW8ZJyyiwEw== X-Received: by 10.101.98.90 with SMTP id q26mr27288934pgv.158.1516036258116; Mon, 15 Jan 2018 09:10:58 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id f5sm112530pgn.13.2018.01.15.09.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 09:10:57 -0800 (PST) From: Bjorn Andersson To: Arend van Spriel , Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo Cc: linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] brcmfmac: Make sure CLM downloading is optional Date: Mon, 15 Jan 2018 09:10:53 -0800 Message-Id: <20180115171053.8802-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.15.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The presence of a CLM file is described as optional, but missing the clm blob causes the preinit to return unsuccessfully. Fix this by ignoring the return value of the brcmf_c_process_clm_blob(). Also remove the extra debug print, as brcmf_c_process_clm_blob() already did print a useful error message before returning. Fixes: fdd0bd88ceae ("brcmfmac: add CLM download support") Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson --- This regression was introduced in v4.15-rc1, but I unfortunately didn't test WiFi until now. Included a Cc to stable@ in case you choose to pick this up after v4.15. drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 6a59d0609d30..0c67ba6ae135 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -278,12 +278,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) } ri->result = err; - /* Do any CLM downloading */ - err = brcmf_c_process_clm_blob(ifp); - if (err < 0) { - brcmf_err("download CLM blob file failed, %d\n", err); - goto done; - } + /* Do any optional CLM downloading */ + brcmf_c_process_clm_blob(ifp); /* query for 'ver' to get version info from firmware */ memset(buf, 0, sizeof(buf));