Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / drivers / clk / clk-mux.c

diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 7129c86a79dbfa679fa6dd707dab70aad9821324..5ed03c8a8df9e122b904d5c62bb603f884d4deb5 100644 (file)
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -71,10 +71,9 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
        u32 val;
        unsigned long flags = 0;
 
-       if (mux->table)
+       if (mux->table) {
                index = mux->table[index];
-
-       else {
+       } else {
                if (mux->flags & CLK_MUX_INDEX_BIT)
                        index = 1 << index;