evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source 
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] VR41xx: unsigned irq cannot be negative
This commit is contained in:
Linus Torvalds 2008-09-16 19:35:49 -07:00
commit 1b901aa2b5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/mips/vr41xx/common/irq.c
View file

@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq)
cascade = irq_cascade + irq; cascade = irq_cascade + irq;
if (cascade->get_irq != NULL) { if (cascade->get_irq != NULL) {
unsigned int source_irq = irq; unsigned int source_irq = irq;
int ret;
desc = irq_desc + source_irq; desc = irq_desc + source_irq;
if (desc->chip->mask_ack) if (desc->chip->mask_ack)
desc->chip->mask_ack(source_irq); desc->chip->mask_ack(source_irq);
@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq)
desc->chip->mask(source_irq); desc->chip->mask(source_irq);
desc->chip->ack(source_irq); desc->chip->ack(source_irq);
} }
irq = cascade->get_irq(irq); ret = cascade->get_irq(irq);
if (irq < 0) irq = ret;
if (ret < 0)
atomic_inc(&irq_err_count); atomic_inc(&irq_err_count);
else else
irq_dispatch(irq); irq_dispatch(irq);