---

yaml --- r: 274090 b: refs/heads/master c: df303e0 h: refs/heads/master v: v3
git-mirror · Oct 12, 2011 · f60e37d · f60e37d
1 parent 5955ce0
commit f60e37d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18c55cd466c12ede49638822d3a71eb1f24e0d25
+refs/heads/master: df303e0236417ca006e04116f18641dbe4bd704a
diff --git a/trunk/arch/arm/plat-samsung/adc.c b/trunk/arch/arm/plat-samsung/adc.c
@@ -98,7 +98,8 @@ static inline void s3c_adc_select(struct adc_device *adc,
 
 	client->select_cb(client, 1);
 
-	con &= ~S3C2410_ADCCON_MUXMASK;
+	if (cpu == TYPE_ADCV1 || cpu == TYPE_ADCV2)
+		con &= ~S3C2410_ADCCON_MUXMASK;
 	con &= ~S3C2410_ADCCON_STDBM;
 	con &= ~S3C2410_ADCCON_STARTMASK;