diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-27 17:07:28 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-27 17:07:28 +0000 |
| commit | 550b5a8a069a9c83c2b6f8b8733548116bc20cd3 (patch) | |
| tree | e73f2ed0fef750255755dd6e2466d5dc95a72d5b /target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch | |
| parent | 82d90cbeb1d2373f69e162396db380a12f096d1b (diff) | |
brcm47xx: update sprom patches like they are in the mainline kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 ae7b7d4dc..075f7bee5 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) -@@ -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); |