---

yaml --- r: 256454 b: refs/heads/master c: 534e7a4 h: refs/heads/master v: v3
git-mirror · Jul 11, 2011 · 929ef8a · 929ef8a
1 parent 3ce8404
commit 929ef8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edcc3604805b37344d0569b61a34dbe22943ba9f
+refs/heads/master: 534e7a4566ca5fd3c0c92a655bcbaa6f9bd13042
diff --git a/trunk/drivers/bcma/main.c b/trunk/drivers/bcma/main.c
@@ -149,7 +149,9 @@ int bcma_bus_register(struct bcma_bus *bus)
 
 	/* Try to get SPROM */
 	err = bcma_sprom_get(bus);
-	if (err) {
+	if (err == -ENOENT) {
+		pr_err("No SPROM available\n");
+	} else if (err) {
 		pr_err("Failed to get SPROM: %d\n", err);
 		return -ENOENT;
 	}

diff --git a/trunk/drivers/bcma/sprom.c b/trunk/drivers/bcma/sprom.c
@@ -143,6 +143,9 @@ int bcma_sprom_get(struct bcma_bus *bus)
 	if (!bus->drv_cc.core)
 		return -EOPNOTSUPP;
 
+	if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
+		return -ENOENT;
+
 	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			GFP_KERNEL);
 	if (!sprom)