From 86c6827c4bf26156f5e4cfd7cab5eeba5e376300 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 14 Apr 2012 14:38:54 +0200
Subject: [PATCH] --- yaml --- r: 299559 b: refs/heads/master c:
 32998cc96a76cc3f42f66b55fec301377e439c66 h: refs/heads/master i:   299557:
 1754eed4ee77653c31f24679d1720d0537247eae   299555:
 02b3edfb89cf78e296b396d9ffefbe112841bffd   299551:
 be89144db1f65079a9d4b505a439bcd51e7b527f v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/bcma/sprom.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 293912f28863..9fde70978d65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 428ca8a7065354877db63ceabfc493107686eebe
+refs/heads/master: 32998cc96a76cc3f42f66b55fec301377e439c66
diff --git a/trunk/drivers/bcma/sprom.c b/trunk/drivers/bcma/sprom.c
index cdcf75c0954f..3e2a6002aae6 100644
--- a/trunk/drivers/bcma/sprom.c
+++ b/trunk/drivers/bcma/sprom.c
@@ -404,16 +404,19 @@ int bcma_sprom_get(struct bcma_bus *bus)
 		return -EOPNOTSUPP;
 
 	if (!bcma_sprom_ext_available(bus)) {
+		bool sprom_onchip;
+
 		/*
 		 * External SPROM takes precedence so check
 		 * on-chip OTP only when no external SPROM
 		 * is present.
 		 */
-		if (bcma_sprom_onchip_available(bus)) {
+		sprom_onchip = bcma_sprom_onchip_available(bus);
+		if (sprom_onchip) {
 			/* determine offset */
 			offset = bcma_sprom_onchip_offset(bus);
 		}
-		if (!offset) {
+		if (!offset || !sprom_onchip) {
 			/*
 			 * Maybe there is no SPROM on the device?
 			 * Now we ask the arch code if there is some sprom