---

yaml
---
r: 299559
b: refs/heads/master
c: 32998cc
h: refs/heads/master
i:
  299557: 1754eed
  299555: 02b3edf
  299551: be89144
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 428ca8a7065354877db63ceabfc493107686eebe
+refs/heads/master: 32998cc96a76cc3f42f66b55fec301377e439c66

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