summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-03-06 15:50:47 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 15:16:18 -0500
commit4ac887cfdad909f16ee1886fe4fa19b452fc7fd3 (patch)
treec1097f92d77ca108ff5a3e6cec0800287fefc80b /drivers/bcma
parent5c17ddc4a047c59638c7eb8537aa887a1ddb9b0b (diff)
downloadlinux-stable-4ac887cfdad909f16ee1886fe4fa19b452fc7fd3.tar.gz
linux-stable-4ac887cfdad909f16ee1886fe4fa19b452fc7fd3.tar.bz2
linux-stable-4ac887cfdad909f16ee1886fe4fa19b452fc7fd3.zip
bcma: return error in bcma_sprom_get() when fallback fails
When not SPROM is available a fallback mechanism is used. However, when that fails the code currently continues. This patch assures that the bcma_sprom_get() function aborts when that happens. Cc: Rafal Milecki <zajec5@gmail.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma')
-rw-r--r--drivers/bcma/sprom.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index 916ae255ff64..fba8066857d2 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -49,10 +49,23 @@ int bcma_arch_register_fallback_sprom(int (*sprom_callback)(struct bcma_bus *bus
static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
struct ssb_sprom *out)
{
- if (!get_fallback_sprom)
- return -ENOENT;
+ int err;
- return get_fallback_sprom(bus, out);
+ if (!get_fallback_sprom) {
+ err = -ENOENT;
+ goto fail;
+ }
+
+ err = get_fallback_sprom(bus, out);
+ if (err)
+ goto fail;
+
+ pr_debug("Using SPROM revision %d provided by"
+ " platform.\n", bus->sprom.revision);
+ return 0;
+fail:
+ pr_warn("Using fallback SPROM failed (err %d)\n", err);
+ return err;
}
/**************************************************
@@ -317,13 +330,7 @@ int bcma_sprom_get(struct bcma_bus *bus)
* available for this device in some other storage.
*/
err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
- if (err) {
- pr_warn("Using fallback SPROM failed (err %d)\n", err);
- } else {
- pr_debug("Using SPROM revision %d provided by"
- " platform.\n", bus->sprom.revision);
- return 0;
- }
+ return err;
}
sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),