diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-07-13 15:30:48 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-25 04:11:17 +0100 |
| commit | 3bbc9e1917b93542c0da222e06496f37d1e82182 (patch) | |
| tree | d338113d69431d7570ef7a226f0dc7437819c91a /arch/arm/plat-samsung | |
| parent | eb42f93d7f329d7ff24d99975ce144f01b1990fb (diff) | |
| download | kernel_samsung_smdk4412-3bbc9e1917b93542c0da222e06496f37d1e82182.zip kernel_samsung_smdk4412-3bbc9e1917b93542c0da222e06496f37d1e82182.tar.gz kernel_samsung_smdk4412-3bbc9e1917b93542c0da222e06496f37d1e82182.tar.bz2 | |
ARM: SAMSUNG: fix race in s3c_adc_start for ADC
commit 8265981bb439f3ecc5356fb877a6c2a6636ac88a upstream.
Checking for adc->ts_pend already claimed should be done with the
lock held.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/adc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index 33ecd0c..b1e05cc 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c @@ -157,11 +157,13 @@ int s3c_adc_start(struct s3c_adc_client *client, return -EINVAL; } - if (client->is_ts && adc->ts_pend) - return -EAGAIN; - spin_lock_irqsave(&adc->lock, flags); + if (client->is_ts && adc->ts_pend) { + spin_unlock_irqrestore(&adc->lock, flags); + return -EAGAIN; + } + client->channel = channel; client->nr_samples = nr_samples; |