From f60e37d25f47e8ceb8347a01b2e2cc2c474b14bf Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Wed, 12 Oct 2011 21:34:11 +0900 Subject: [PATCH] --- yaml --- r: 274090 b: refs/heads/master c: df303e0236417ca006e04116f18641dbe4bd704a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/adc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6eb32ef73b43..9f8d98fd5731 100644 --- 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 index ee8deef19481..7821055a5046 100644 --- 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;