Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Clean up after WM83xx AUXADC interrupt if it arrives late
+7
+3
drivers/mfd/wm831x-core.c
+3
drivers/mfd/wm831x-core.c
···
349
349
goto disable;
350
350
}
351
351
352
+
/* If an interrupt arrived late clean up after it */
353
+
try_wait_for_completion(&wm831x->auxadc_done);
354
+
352
355
/* Ignore the result to allow us to soldier on without IRQ hookup */
353
356
wait_for_completion_timeout(&wm831x->auxadc_done, msecs_to_jiffies(5));
354
357
+4
drivers/mfd/wm8350-core.c
+4
drivers/mfd/wm8350-core.c
···
363
363
reg |= 1 << channel | WM8350_AUXADC_POLL;
364
364
wm8350_reg_write(wm8350, WM8350_DIGITISER_CONTROL_1, reg);
365
365
366
+
/* If a late IRQ left the completion signalled then consume
367
+
* the completion. */
368
+
try_wait_for_completion(&wm8350->auxadc_done);
369
+
366
370
/* We ignore the result of the completion and just check for a
367
371
* conversion result, allowing us to soldier on if the IRQ
368
372
* infrastructure is not set up for the chip. */