From 408dcfa3d0295f6bed2dae69a2f6d6e427dbe804 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 10 Oct 2011 12:14:14 +0200 Subject: [PATCH] --- yaml --- r: 273435 b: refs/heads/master c: e62ccf3a7a21d62d92520f47ba5bd7e2112d8c1b h: refs/heads/master i: 273433: be9fac786983e90fca792aea5998eefa0f52748d 273431: de55986c69d72ed637b577c87ae0652a00cb0ad7 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/db8500-prcmu.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5c6391a06fb7..83e4088b376e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1934dae220ed1f1a832a191a86c1becfcbb3a094 +refs/heads/master: e62ccf3a7a21d62d92520f47ba5bd7e2112d8c1b diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c index 98da431af044..e996d11980fa 100644 --- a/trunk/drivers/mfd/db8500-prcmu.c +++ b/trunk/drivers/mfd/db8500-prcmu.c @@ -1433,18 +1433,21 @@ static int request_sga_clock(u8 clock, bool enable) */ int db8500_prcmu_request_clock(u8 clock, bool enable) { - if (clock == PRCMU_SGACLK) + switch(clock) { + case PRCMU_SGACLK: return request_sga_clock(clock, enable); - else if (clock < PRCMU_NUM_REG_CLOCKS) - return request_reg_clock(clock, enable); - else if (clock == PRCMU_TIMCLK) + case PRCMU_TIMCLK: return request_timclk(enable); - else if (clock == PRCMU_SYSCLK) + case PRCMU_SYSCLK: return request_sysclk(enable); - else if (clock == PRCMU_PLLSOC1) + case PRCMU_PLLSOC1: return request_pll(clock, enable); - else - return -EINVAL; + default: + break; + } + if (clock < PRCMU_NUM_REG_CLOCKS) + return request_reg_clock(clock, enable); + return -EINVAL; } int db8500_prcmu_config_esram0_deep_sleep(u8 state)