From eff42a3c4ec90b773d366560d8957176028d78f2 Mon Sep 17 00:00:00 2001
From: Ramax Lo <ramaxlo@gmail.com>
Date: Tue, 14 Apr 2009 23:56:18 +0800
Subject: [PATCH] --- yaml --- r: 143581 b: refs/heads/master c:
 0c3ee078251b85812e585b5cf5d1635afd73f4e2 h: refs/heads/master i:   143579:
 9bdab7b1038c7cbe9cee2a63da3b4d3bd4f922a7 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/plat-s3c24xx/adc.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 82165e3c6c96..93669c5e4dd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8c8ac8109ecdd3583b0ac9fd3adf058678a802e
+refs/heads/master: 0c3ee078251b85812e585b5cf5d1635afd73f4e2
diff --git a/trunk/arch/arm/plat-s3c24xx/adc.c b/trunk/arch/arm/plat-s3c24xx/adc.c
index bc6f6a14dd12..91adfa71c172 100644
--- a/trunk/arch/arm/plat-s3c24xx/adc.c
+++ b/trunk/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);