mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
ARM: SAMSUNG: Fix mux bit modification in s3c_adc_select
The mux bits in the adccon register should be cleared only if muxing is really done in ADCCON and not another register. This patch introduces a conditional for this. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
parent
18c55cd466
commit
df303e0236
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue