diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-24 21:56:42 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-24 21:56:42 +0000 |
| commit | 91a591d3285bc27eac883b7409595a087886d877 (patch) | |
| tree | a3dd840594595278b85afc5104c6dce280545cd1 /target/linux | |
| parent | ee396d93e1551bdd3ad8fa786e45485d64890aeb (diff) | |
brcm47xx: A couple of other (inconsequential) BCMA patches
Noticed these while reviewing the code.
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31471 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch | 20 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch | 10 |
2 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch b/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch new file mode 100644 index 000000000..85b47fa7f --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch @@ -0,0 +1,20 @@ +--- a/drivers/bcma/host_pci.c ++++ b/drivers/bcma/host_pci.c +@@ -222,7 +222,7 @@ err_kfree_bus: + return err; + } + +-static void bcma_host_pci_remove(struct pci_dev *dev) ++static void __devexit bcma_host_pci_remove(struct pci_dev *dev) + { + struct bcma_bus *bus = pci_get_drvdata(dev); + +@@ -278,7 +278,7 @@ static struct pci_driver bcma_pci_bridge + .name = "bcma-pci-bridge", + .id_table = bcma_pci_bridge_tbl, + .probe = bcma_host_pci_probe, +- .remove = bcma_host_pci_remove, ++ .remove = __devexit_p(bcma_host_pci_remove), + .driver.pm = BCMA_PM_OPS, + }; + diff --git a/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch b/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch new file mode 100644 index 000000000..285c356ad --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch @@ -0,0 +1,10 @@ +--- a/drivers/bcma/core.c ++++ b/drivers/bcma/core.c +@@ -30,6 +30,7 @@ void bcma_core_disable(struct bcma_devic + udelay(10); + + bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET); ++ bcma_aread32(core, BCMA_RESET_CTL); + udelay(1); + } + EXPORT_SYMBOL_GPL(bcma_core_disable); |