summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorRamax Lo <ramaxlo@gmail.com>2009-04-14 23:56:18 +0800
committerBen Dooks <ben-linux@fluff.org>2009-04-17 12:46:36 +0100
commit0c3ee078251b85812e585b5cf5d1635afd73f4e2 (patch)
treecbf8ed548280cc99d66e1d3b8a1375fe1f908e37 /arch/arm/plat-s3c24xx
parentf8c8ac8109ecdd3583b0ac9fd3adf058678a802e (diff)
downloadop-kernel-dev-0c3ee078251b85812e585b5cf5d1635afd73f4e2.zip
op-kernel-dev-0c3ee078251b85812e585b5cf5d1635afd73f4e2.tar.gz
[ARM] S3C24XX: ADC: Check pending queue before freeing adc client
Check pending queue and remove the adc client being released. Signed-off-by: Ramax Lo <ramaxlo@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/adc.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
index bc6f6a1..91adfa7 100644
--- a/arch/arm/plat-s3c24xx/adc.c
+++ b/arch/arm/plat-s3c24xx/adc.c
@@ -190,6 +190,23 @@ EXPORT_SYMBOL_GPL(s3c_adc_register);
void s3c_adc_release(struct s3c_adc_client *client)
{
/* We should really check that nothing is in progress. */
+ if (adc_dev->cur == client)
+ adc_dev->cur = NULL;
+ if (adc_dev->ts_pend == client)
+ adc_dev->ts_pend = NULL;
+ else {
+ struct list_head *p, *n;
+ struct s3c_adc_client *tmp;
+
+ list_for_each_safe(p, n, &adc_pending) {
+ tmp = list_entry(p, struct s3c_adc_client, pend);
+ if (tmp == client)
+ list_del(&tmp->pend);
+ }
+ }
+
+ if (adc_dev->cur == NULL)
+ s3c_adc_try(adc_dev);
kfree(client);
}
EXPORT_SYMBOL_GPL(s3c_adc_release);
OpenPOWER on IntegriCloud