Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbdFSTP2 (ORCPT + 2 others); Mon, 19 Jun 2017 15:15:28 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:52292 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753007AbdFSSgW (ORCPT ); Mon, 19 Jun 2017 14:36:22 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Larry Finger , Kalle Valo , Willy Tarreau Subject: [PATCH 3.10 064/268] ssb: Fix error routine when fallback SPROM fails Date: Mon, 19 Jun 2017 20:29:23 +0200 Message-Id: <1497897167-14556-65-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Larry Finger commit 8052d7245b6089992343c80b38b14dbbd8354651 upstream. 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 Signed-off-by: Kalle Valo Signed-off-by: Willy Tarreau --- drivers/ssb/pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index a8dc95e..7700cef 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -846,6 +846,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); -- 2.8.0.rc2.1.gbe9624a