Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / drivers / qe / uccf.c

diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index 25f74826c00a2f2fbf5e862340b602eb8c6a05a0..c5477e0d7ec03ba09b35e70ca8adf00641d5370a 100644 (file)
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -46,7 +46,7 @@ u32 ucc_fast_get_qe_cr_subblock(int ucc_num)
                case 6: return QE_CR_SUBBLOCK_UCCFAST7;
                case 7: return QE_CR_SUBBLOCK_UCCFAST8;
                default:        return QE_CR_SUBBLOCK_INVALID;
-    }
+       }
 }
 
 static void ucc_get_cmxucr_reg(int ucc_num, volatile u32 **p_cmxucr,
@@ -100,9 +100,9 @@ static void ucc_get_cmxucr_reg(int ucc_num, volatile u32 **p_cmxucr,
 
 static int ucc_set_clk_src(int ucc_num, qe_clock_e clock, comm_dir_e mode)
 {
-       volatile u32    *p_cmxucr;
-       u8              reg_num;
-       u8              shift;
+       volatile u32    *p_cmxucr = NULL;
+       u8              reg_num = 0;
+       u8              shift = 0;
        u32             clockBits;
        u32             clockMask;
        int             source = -1;