All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rafał Miłecki" <zajec5@gmail.com>
To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Cc: "Hauke Mehrtens" <hauke@hauke-m.de>, "Rafał Miłecki" <zajec5@gmail.com>
Subject: [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM
Date: Thu, 14 May 2015 09:42:50 +0200	[thread overview]
Message-ID: <1431589370-30147-1-git-send-email-zajec5@gmail.com> (raw)

In the recent SPROM commit:
MIPS: BCM47xx: Read board info for all bcma buses
a proper handling of "fallback" argument has been dropped. Restore it.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 arch/mips/bcm47xx/sprom.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 8485143..b0d62e7 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -698,6 +698,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
 	struct bcma_device *core;
 	char buf[10];
 	char *prefix;
+	bool fallback = false;
 
 	switch (bus->hosttype) {
 	case BCMA_HOSTTYPE_PCI:
@@ -715,6 +716,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
 			snprintf(buf, sizeof(buf), "sb/%u/",
 				 core->core_index);
 			prefix = buf;
+			fallback = true;
 		} else {
 			prefix = NULL;
 		}
@@ -729,7 +731,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
 		binfo->vendor = SSB_BOARDVENDOR_BCM;
 	nvram_read_u16(prefix, NULL, "boardtype", &binfo->type, 0, true);
 
-	bcm47xx_fill_sprom(out, prefix, false);
+	bcm47xx_fill_sprom(out, prefix, fallback);
 
 	return 0;
 }
-- 
1.8.4.5

             reply	other threads:[~2015-05-14  7:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-14  7:42 Rafał Miłecki [this message]
2015-05-14  8:52 ` [PATCH] MIPS: BCM47XX: Fix regression in reading WiFi SoC SPROM Markos Chandras
2015-05-14  9:18   ` Rafał Miłecki
2015-05-15 14:12     ` Ralf Baechle
2015-05-15 14:18       ` Rafał Miłecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431589370-30147-1-git-send-email-zajec5@gmail.com \
    --to=zajec5@gmail.com \
    --cc=hauke@hauke-m.de \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.