aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-samsung/adc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index e8f2be2d67f..df14954aa1c 100644
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -143,11 +143,13 @@ int s3c_adc_start(struct s3c_adc_client *client,
143 return -EINVAL; 143 return -EINVAL;
144 } 144 }
145 145
146 if (client->is_ts && adc->ts_pend)
147 return -EAGAIN;
148
149 spin_lock_irqsave(&adc->lock, flags); 146 spin_lock_irqsave(&adc->lock, flags);
150 147
148 if (client->is_ts && adc->ts_pend) {
149 spin_unlock_irqrestore(&adc->lock, flags);
150 return -EAGAIN;
151 }
152
151 client->channel = channel; 153 client->channel = channel;
152 client->nr_samples = nr_samples; 154 client->nr_samples = nr_samples;
153 155