diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 16:56:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 16:56:54 +0000 |
| commit | a105eea1a13347ae64525a1b4e162edbb76e4ecc (patch) | |
| tree | dad9b6c4ed80c29e9f44c1fa5c6b5cbbf4c6a1ea /target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch | |
| parent | ac383f95a515c4092f7fafe91046b8443beceaef (diff) | |
| download | upstream-a105eea1a13347ae64525a1b4e162edbb76e4ecc.tar.gz upstream-a105eea1a13347ae64525a1b4e162edbb76e4ecc.tar.bz2 upstream-a105eea1a13347ae64525a1b4e162edbb76e4ecc.zip | |
brcm47xx: various fixes and code cleanups for irq code
This is based on a patch send by Nathan Hintz <nlhintz@hotmail.com>
SVN-Revision: 34997
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch index 90d05bc8fd..5df8636058 100644 --- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch +++ b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch @@ -1,6 +1,6 @@ --- a/include/linux/bcma/bcma_driver_mips.h +++ b/include/linux/bcma/bcma_driver_mips.h -@@ -49,6 +49,6 @@ static inline void bcma_core_mips_early_ +@@ -48,6 +48,6 @@ static inline void bcma_core_mips_early_ extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore); @@ -30,7 +30,7 @@ { struct bcma_device *mdev = dev->bus->drv_mips.core; u32 irqflag; -@@ -106,7 +106,12 @@ unsigned int bcma_core_mips_irq(struct b +@@ -103,7 +103,13 @@ unsigned int bcma_core_mips_irq(struct b return 5; } @@ -38,7 +38,8 @@ + +unsigned int bcma_core_irq(struct bcma_device *dev) +{ -+ return bcma_core_mips_irq(dev) + 2; ++ unsigned int mips_irq = bcma_core_mips_irq(dev); ++ return mips_irq <= 4 ? mips_irq + 2 : 0; +} +EXPORT_SYMBOL(bcma_core_irq); |