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: 124545 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp734580lje; Mon, 15 Jan 2018 09:11:04 -0800 (PST) X-Google-Smtp-Source: ACJfBotlmsHr+yxg+NT/lOY0776LTAdIFdZ7C7Wnrzl2eQqgd3MlQBErPPpxZTFVZb/rHzIUS3mI X-Received: by 10.159.251.145 with SMTP id m17mr14790360pls.315.1516036264269; Mon, 15 Jan 2018 09:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516036264; cv=none; d=google.com; s=arc-20160816; b=LGX4j5lAO6LRAJVs+BzPad5Ku2k27OcvdQeFftuphhqJz4bBQMYh0pv3LeFoJYL4d0 tBcQBu2q60519JWLlfYaEbK+CD1DbxyXurgiDybFFoq9OQBnC7FwZ+tMC4j4VYIzI2fS CwDr67mYAvfSGtEHJIaI7M/OCKNNt6Gq8rouCgwJYSykxDa39SvKJShTE/r/aC4sQ3GL z3htnVonL+58+w81Yd+zFCQsZ8eiPx+53E064PTXC5D2raLnPLO1iJdrPgR4H+VooNPA 7sC3qVbGpD+qEuFaLEEIWt6XvS4gShdbTrJptuX01OCJHqpcLbrKk2j58cDMZQvDEgFl CGHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=LJLnC3lKJixRy6rwnYKVbHY/Iwy8TDZkxK1BXRklM/A=; b=dVIvj3SkLOoqvpc9hY2TCg71d2p4Q4VPrTRF8pp4G8VkF385wiB9UYYP//HoDDx9e2 kv9/XeKg2BZ8X8Rij2gnanqtFLa3Mu++C1Y2dYMZtkmMdPS1OeODMGrhR26DwUS0z/yY LKxJS/ha+hG1M2OIERzVHj/KGAOJGSwWIwrxhCf63XDxJqcF41NVvO/PF98IYuicz5lW K+9OSx0zYpXBLla5/jhNlOoLLroBNVb/YI88gOCp4pnl1g4jjud5ian0IheeThXlKk4G zSSHdsjUr9TcWIIM+u3dLAkTdZHZGRtIKmmwct6tfZyS0Mxqv9Z3hpxC3OY0+Y5NQyuS KO7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=COU5f3hl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t68si67403pgb.33.2018.01.15.09.11.03; Mon, 15 Jan 2018 09:11:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=COU5f3hl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966173AbeAORLC (ORCPT + 28 others); Mon, 15 Jan 2018 12:11:02 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36941 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965978AbeAORK6 (ORCPT ); Mon, 15 Jan 2018 12:10:58 -0500 Received: by mail-pg0-f68.google.com with SMTP id z17so8243361pgc.4 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=h4ty0MviY+AGMzH5b+blbSCo7IOxLPFHPoGgRAKFH5VMjMU/J4fGSq0qxd98KAwd+g FoEX+8JNqDiOIINFjXcXojzvm/6AbNsPtnO8NxJD1xACkDsgYNAN1aXXu9D9Lv2i8H3H qL4dJzb85/3Lm6pnI+i4C/+8PrKrKw4568nPAeeO0HAZspQlPxDoCTB+1C19ITvHAwKG K0pteipD+x5hOr16483Kusr0kccjtse1sBgzwXYs87sBooS2EWsVrwfrUC905l9jyMdG PDAyj8BGwFPTGeC+rnkSYuhNyZ+GORx37iEqPtoSL5++ohaXW2DRucNNWYECB/P/9W7J 6b6w== X-Gm-Message-State: AKGB3mK683UDfo4HyveDiKWautm99ElJFD4JcYjuXPaxHi68jITcDNIz eYN9MePSKvnapxJxMxOY+vDPxw== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.15.0 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));