[v3,03/12] macintosh/via-pmu: Don't clear shift register interrupt flag twice

Message ID dc2239bf4d037bf85bb1821354534793c3ba2270.1528885172.git.fthain@telegraphics.com.au
State Superseded
Headers show
  • macintosh: Resolve various PMU driver problems
Related show

Commit Message

Finn Thain June 13, 2018, 10:38 a.m.
The shift register interrupt flag gets cleared in via_pmu_interrupt()
and once again in pmu_sr_intr(). Fix this theoretical race condition.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
 drivers/macintosh/via-pmu.c | 1 -
 1 file changed, 1 deletion(-)


diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 74065ea410bd..4c1bae5380c2 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -1458,7 +1458,6 @@  pmu_sr_intr(void)
 	if (in_8(&via[B]) & TREQ) {
 		printk(KERN_ERR "PMU: spurious SR intr (%x)\n", in_8(&via[B]));
-		out_8(&via[IFR], SR_INT);
 		return NULL;
 	/* The ack may not yet be low when we get the interrupt */