Merge branch 'linus' into x86/xen

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c
index 5b5a14dab3d3..6aa5294dfec4 100644
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -211,8 +211,7 @@ int pwm_clk_alloc(unsigned prescale, unsigned div)
         if ((mr & 0xffff) == 0) {
                 mr |= val;
                 ret = PWM_CPR_CLKA;
-        }
-        if ((mr & (0xffff << 16)) == 0) {
+        } else if ((mr & (0xffff << 16)) == 0) {
                 mr |= val << 16;
                 ret = PWM_CPR_CLKB;
         }