Commit 3bbc9e19 authored by Todd Poynor's avatar Todd Poynor Committed by Ben Hutchings

ARM: SAMSUNG: fix race in s3c_adc_start for ADC

commit 8265981b upstream.

Checking for adc->ts_pend already claimed should be done with the
lock held.
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent eb42f93d
...@@ -157,11 +157,13 @@ int s3c_adc_start(struct s3c_adc_client *client, ...@@ -157,11 +157,13 @@ int s3c_adc_start(struct s3c_adc_client *client,
return -EINVAL; return -EINVAL;
} }
if (client->is_ts && adc->ts_pend)
return -EAGAIN;
spin_lock_irqsave(&adc->lock, flags); 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->channel = channel;
client->nr_samples = nr_samples; client->nr_samples = nr_samples;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment