a105eea1a1
This is based on a patch send by Nathan Hintz <nlhintz@hotmail.com> SVN-Revision: 34997
25 lines
791 B
Diff
25 lines
791 B
Diff
--- a/drivers/bcma/driver_mips.c
|
|
+++ b/drivers/bcma/driver_mips.c
|
|
@@ -131,9 +131,9 @@ static void bcma_core_mips_set_irq(struc
|
|
bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
|
|
(1 << irqflag));
|
|
} else {
|
|
- u32 oldirqflag = bcma_read32(mdev,
|
|
- BCMA_MIPS_MIPS74K_INTMASK(irq));
|
|
- if (oldirqflag) {
|
|
+ u32 irqinitmask = bcma_read32(mdev,
|
|
+ BCMA_MIPS_MIPS74K_INTMASK(irq));
|
|
+ if (irqinitmask) {
|
|
struct bcma_device *core;
|
|
|
|
/* backplane irq line is in use, find out who uses
|
|
@@ -141,7 +141,7 @@ static void bcma_core_mips_set_irq(struc
|
|
*/
|
|
list_for_each_entry(core, &bus->cores, list) {
|
|
if ((1 << bcma_core_mips_irqflag(core)) ==
|
|
- oldirqflag) {
|
|
+ irqinitmask) {
|
|
bcma_core_mips_set_irq(core, 0);
|
|
break;
|
|
}
|