From 291b4a98c496837bf0ef48dcd1afe018f714d4ba Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 11 Mar 2012 13:36:46 +0000 Subject: brcm47xx: make patch apply git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30876 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch index a9f176f9a..c991ed313 100644 --- a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch +++ b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch @@ -16,17 +16,17 @@ bcm47xx_fill_sprom(&iv->sprom, NULL); if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) -@@ -204,12 +206,14 @@ static int bcm47xx_get_sprom_bcma(struct +@@ -203,12 +205,14 @@ static int bcm47xx_get_sprom_bcma(struct + struct bcma_device *core; - switch (bus->hosttype) { - case BCMA_HOSTTYPE_PCI: + if (bus->hosttype == BCMA_HOSTTYPE_PCI) { + memset(out, 0, sizeof(struct ssb_sprom)); snprintf(prefix, sizeof(prefix), "pci/%u/%u/", bus->host_pci->bus->number + 1, PCI_SLOT(bus->host_pci->devfn)); bcm47xx_fill_sprom(out, prefix); return 0; - case BCMA_HOSTTYPE_SOC: + } else if (bus->hosttype == BCMA_HOSTTYPE_SOC) { + memset(out, 0, sizeof(struct ssb_sprom)); bcm47xx_fill_sprom_ethernet(out, NULL); core = bcma_find_core(bus, BCMA_CORE_80211); -- cgit v1.2.3