diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /drivers/mfd/wm831x-core.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mfd/wm831x-core.c')
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index a3d5728b6449..f2ab025ad97a 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c | |||
| @@ -349,6 +349,9 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input) | |||
| 349 | goto disable; | 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 | /* Ignore the result to allow us to soldier on without IRQ hookup */ | 355 | /* Ignore the result to allow us to soldier on without IRQ hookup */ |
| 353 | wait_for_completion_timeout(&wm831x->auxadc_done, msecs_to_jiffies(5)); | 356 | wait_for_completion_timeout(&wm831x->auxadc_done, msecs_to_jiffies(5)); |
| 354 | 357 | ||