diff options
| author | Erik Gilling <konkers@android.com> | 2011-10-13 13:07:46 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-10-13 13:07:46 -0700 |
| commit | 6b69678f50611cd9e3240bdd264a75de187e0d29 (patch) | |
| tree | a24a9f2eee5f91daf29ccbf1301fd52670fcf126 /drivers/mfd | |
| parent | 03246ac92ea4863bf047f8d332dbb7a2ca5d805d (diff) | |
| parent | a77bcf8c4218788e45132bc49db004c2545cae5b (diff) | |
| download | kernel_samsung_tuna-6b69678f50611cd9e3240bdd264a75de187e0d29.zip kernel_samsung_tuna-6b69678f50611cd9e3240bdd264a75de187e0d29.tar.gz kernel_samsung_tuna-6b69678f50611cd9e3240bdd264a75de187e0d29.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6030-madc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mfd/twl6030-madc.c b/drivers/mfd/twl6030-madc.c index 6e21b4d..96bfa9f 100644 --- a/drivers/mfd/twl6030-madc.c +++ b/drivers/mfd/twl6030-madc.c @@ -126,8 +126,12 @@ static int twl6030_madc_wait_conversion_ready(struct twl6030_madc_data *madc, ret = 0; goto unlock; } + + if (time_after(jiffies, timeout)) + break; + usleep_range(500, 2000); - } while (!time_after(jiffies, timeout)); + } while (1); dev_err(madc->dev, "conversion timeout, ctrl_px=0x%08x\n", reg); ret = -EAGAIN; |