Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 534e7a45 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: add check if sprom is available before accessing it. 



The SoCs like the bcm4716 do not have a sprom on the bcma bus like a
pcie device. It stores the values in some partition on flash memory.
For ssb this informations are read out in the bcm47xx arch code,
something like that should also be implemented for bcma. Without this
patch bcma panics on SoCs.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent edcc3604

drivers/bcma/main.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/bcma/sprom.c

+3 −0
Original line number Diff line number Diff line
@@ -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)