brcm47xx: update sprom patches like they are in the mainline kernel

[openwrt/staging/wigyori.git] / target / linux / brcm47xx / patches-3.2 / 231-bcma_reorder_sprom_fill.patch

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 ae7b7d4dcd698155b28204d266d1dbdb317a4f68..075f7bee5351751a2d2ee54bb12eb1a5380d425f 100644 (file)
--- 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)
-@@ -205,12 +207,14 @@ static int bcm47xx_get_sprom_bcma(struct
-       struct bcma_device *core;
+@@ -206,12 +208,14 @@ static int bcm47xx_get_sprom_bcma(struct
  
-       if (bus->hosttype == BCMA_HOSTTYPE_PCI) {
+       switch (bus->hosttype) {
+       case 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;
-       } else if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
+       case BCMA_HOSTTYPE_SOC:
 +              memset(out, 0, sizeof(struct ssb_sprom));
                bcm47xx_fill_sprom_ethernet(out, NULL);
                core = bcma_find_core(bus, BCMA_CORE_80211);