Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100AbcCOVqm (ORCPT ); Tue, 15 Mar 2016 17:46:42 -0400 Received: from emh02.mail.saunalahti.fi ([62.142.5.108]:51718 "EHLO emh02.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbcCOVqk (ORCPT ); Tue, 15 Mar 2016 17:46:40 -0400 From: Aaro Koskinen To: Stephen Boyd , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Andrew Morton Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Aaro Koskinen Subject: [PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy Date: Tue, 15 Mar 2016 23:46:26 +0200 Message-Id: <1458078386-30254-1-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.7.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1308 Lines: 30 Commit 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use __ioread32_copy() instead of open-coding") switched to use a generic copy functions, but failed to notice that the header pointer is updated between the two copies, resulting in bogus data being copied in the latter one. Fix by keeping the old header pointer as references to iomem should be fine. The patch fixes totally broken networking on WRL54GL router (both LAN and WLAN interfaces fail to probe). Fixes: 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use __ioread32_copy() instead of open-coding") Signed-off-by: Aaro Koskinen --- drivers/firmware/broadcom/bcm47xx_nvram.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c index 0c2f0a6..7fe5bf2 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c @@ -94,7 +94,6 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) found: __ioread32_copy(nvram_buf, header, sizeof(*header) / 4); - header = (struct nvram_header *)nvram_buf; nvram_len = header->len; if (nvram_len > size) { pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n"); -- 2.7.2