target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch

   1 --- a/drivers/bcma/driver_mips.c
   2 +++ b/drivers/bcma/driver_mips.c
   3 @@ -131,9 +131,9 @@ static void bcma_core_mips_set_irq(struc
   4                             bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
   5                             (1 << irqflag));
   6         } else {
   7 -               u32 oldirqflag = bcma_read32(mdev,
   8 -                                            BCMA_MIPS_MIPS74K_INTMASK(irq));
   9 -               if (oldirqflag) {
  10 +               u32 irqinitmask = bcma_read32(mdev,
  11 +                                             BCMA_MIPS_MIPS74K_INTMASK(irq));
  12 +               if (irqinitmask) {
  13                         struct bcma_device *core;
  14
  15                         /* backplane irq line is in use, find out who uses
  16 @@ -141,7 +141,7 @@ static void bcma_core_mips_set_irq(struc
  17                          */
  18                         list_for_each_entry(core, &bus->cores, list) {
  19                                 if ((1 << bcma_core_mips_irqflag(core)) ==
  20 -                                   oldirqflag) {
  21 +                                   irqinitmask) {
  22                                         bcma_core_mips_set_irq(core, 0);
  23                                         break;
  24                                 }