From patchwork Sat Nov 5 19:08:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9413783 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 35A356022E for ; Sat, 5 Nov 2016 19:09:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AF4B2935A for ; Sat, 5 Nov 2016 19:09:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E3C129673; Sat, 5 Nov 2016 19:09:10 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 5A82B2935A for ; Sat, 5 Nov 2016 19:09:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755511AbcKETJG (ORCPT ); Sat, 5 Nov 2016 15:09:06 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34257 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755084AbcKETJE (ORCPT ); Sat, 5 Nov 2016 15:09:04 -0400 Received: by mail-oi0-f65.google.com with SMTP id 62so16013765oif.1; Sat, 05 Nov 2016 12:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=ImEy+F1HTITYHHo5EX/bo17YTNWYc0g1+l467x6D2qQ=; b=TxdNYm6D3/pc3w/4eWCUI4mGuRO7/VpE6Lxh5r+mginmZY7xaRJXhNYZw9/zKFFNW7 atP/eoG7O+qzK/phlKaOWJcnRhX8jLP3d/LHqTwlctHDbHpMKlPmKGu3uN1/9rr/j0pg teIVcafswpPch4ZSmgGlWHugL2bkj6Q1jOS3fxrLoJOghHK4O5dHG4KlYdDZulUB+Sfi ocNN5j95pbn1Hwhziv5agHxZFP6CWufVUt1M+xkPB0mX3O1+/fs5kF48xGNdz/bnRY5a yEo7rYHSukU6jx7aExwb7oQV7tIU3nj4FXSUgONXEcl7BC/Eyl7lS1vJEyTJ5ODm/dU8 ockg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ImEy+F1HTITYHHo5EX/bo17YTNWYc0g1+l467x6D2qQ=; b=fG3bhtWDdu8cYm7J+iUVrztd9xnesc3pm7NGzsHwHm3Mpk4mc8FE9nVs/G8gW1iyQI Gz3qbOgoybfutf8PECWtc0RI51dIzTAKH0cuzGtPfI/2qWMpD+iSH49qRwa5SSo2i1kf uFxF0fjXk1zzps2u3RgUztTyGoBrn03HJ0OYKe2I0Mk2s5nDtYEtSywBLGkrPhXJLucN wNSzZQSHi3zZU3CQnV1JCQJT4Eaus7ExsyRFsj2Y/hayjJ+mq6PNxX9yjRCQhVIf7Gjv burwqNEGQW8LNC96IX+E7XrH6w2c5j8zEqrVufZ/Vq670ddQWP/Pm7/rsJ7qMc4zCh4v 50ZA== X-Gm-Message-State: ABUngvfeDf984IyXMQafVXPJh0XXKqS66emyUXQgXXw/8UrYPArCo4MMU2c45/f1aiGF5w== X-Received: by 10.202.104.204 with SMTP id o73mr12685933oik.18.1478372943607; Sat, 05 Nov 2016 12:09:03 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id m67sm5529916otc.32.2016.11.05.12.09.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Nov 2016 12:09:02 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, Larry Finger , Stable Subject: [PATCH] ssb: Fix error routine when fallback SPROM fails Date: Sat, 5 Nov 2016 14:08:57 -0500 Message-Id: <20161105190857.19386-1-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.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 When there is a CRC error in the SPROM read from the device, the code attempts to handle a fallback SPROM. When this also fails, the driver returns zero rather than an error code. Signed-off-by: Larry Finger Cc: Stable --- drivers/ssb/pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 0f28c08..77b551d 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -909,6 +909,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, if (err) { ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n", err); + goto out_free; } else { ssb_dbg("Using SPROM revision %d provided by platform\n", sprom->revision);