diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-08-04 20:04:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-08-04 20:04:54 +0000 |
| commit | 871991d9fe32d99d6f5281254c232395f9265569 (patch) | |
| tree | abb83ec10bec5fca01feb069d06eb936196da867 /target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch | |
| parent | c56fd84056e0a83c4bc4ff3707d3ad3a6db46506 (diff) | |
| download | upstream-871991d9fe32d99d6f5281254c232395f9265569.tar.gz upstream-871991d9fe32d99d6f5281254c232395f9265569.tar.bz2 upstream-871991d9fe32d99d6f5281254c232395f9265569.zip | |
brcm47xx: update patches
* this adds sflash support for ssb devices
* the flash is now a platform device
* minor updates
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27902 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch b/target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch deleted file mode 100644 index 685dcdecfd..0000000000 --- a/target/linux/brcm47xx/patches-3.0/0019-bcma-to-not-route-irqs-on-non-pci-devices.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1b23f310d4a7d24efe5dffbbde6b2b84252e2d7b Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Fri, 22 Jul 2011 14:18:21 +0200 -Subject: [PATCH 19/22] bcma: to not route irqs on non pci devices - - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - drivers/bcma/driver_pci.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - ---- a/drivers/bcma/driver_pci.c -+++ b/drivers/bcma/driver_pci.c -@@ -208,7 +208,14 @@ int bcma_core_pci_irq_ctl(struct bcma_dr - { - struct pci_dev *pdev = pc->core->bus->host_pci; - u32 coremask, tmp; -- int err; -+ int err = 0; -+ -+ if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) { -+ /* This bcma device is not on a PCI host-bus. So the IRQs are -+ * not routed through the PCI core. -+ * So we must not enable routing through the PCI core. */ -+ goto out; -+ } - - err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp); - if (err) |