--- 99b5b0c585814236a5e0edee195c3afb0ea1694e
+++ 42e02c8b76715277cc5002e8facaa2ae248d6afc
@@ -675,7 +675,7 @@ static void smd_channel_reset_state(stru
 void smd_channel_reset(uint32_t restart_pid)
 {
 	struct smd_alloc_elm *shared;
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	SMD_DBG("%s: starting reset\n", __func__);
 	shared = smem_find(ID_CH_ALLOC_TBL, sizeof(*shared) * 64);
@@ -971,7 +971,7 @@ static void smd_state_change(struct smd_
 
 static void handle_smd_irq_closing_list(void)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	struct smd_channel *ch;
 	struct smd_channel *index;
 	unsigned tmp;
@@ -989,7 +989,7 @@ static void handle_smd_irq_closing_list(
 
 static void handle_smd_irq(struct list_head *list, void (*notify)(void))
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	struct smd_channel *ch;
 	unsigned ch_flags;
 	unsigned tmp;
@@ -1087,7 +1087,7 @@ static inline int smd_need_int(struct sm
 
 void smd_sleep_exit(void)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	struct smd_channel *ch;
 	int need_int = 0;
 
@@ -1245,7 +1245,7 @@ static int smd_stream_read(smd_channel_t
 
 static int smd_packet_read(smd_channel_t *ch, void *data, int len, int user_buf)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	int r;
 
 	if (len < 0)
@@ -1421,7 +1421,7 @@ static int smd_alloc_channel(struct smd_
 
 static inline void notify_loopback_smd(void)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	struct smd_channel *ch;
 
 	spin_lock_irqsave(&smd_lock, flags);
@@ -1483,7 +1483,7 @@ static void do_nothing_notify(void *priv
 
 static void finalize_channel_close_fn(struct work_struct *work)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	struct smd_channel *ch;
 	struct smd_channel *index;
 
@@ -1522,7 +1522,7 @@ int smd_named_open_on_edge(const char *n
 			   void *priv, void (*notify)(void *, unsigned))
 {
 	struct smd_channel *ch;
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (smd_initialized == 0) {
 		SMD_INFO("smd_open() before smd_init()\n");
@@ -1615,7 +1615,7 @@ EXPORT_SYMBOL(smd_open);
 
 int smd_close(smd_channel_t *ch)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (ch == 0)
 		return -1;
@@ -1898,7 +1898,7 @@ EXPORT_SYMBOL(smd_tiocmset_from_cb);
 
 int smd_tiocmset(smd_channel_t *ch, unsigned int set, unsigned int clear)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (!ch) {
 		pr_err("%s: Invalid channel specified\n", __func__);
@@ -1932,7 +1932,7 @@ void *smem_alloc2(unsigned id, unsigned
 {
 	struct smem_shared *shared = (void *) MSM_SHARED_RAM_BASE;
 	struct smem_heap_entry *toc = shared->heap_toc;
-	unsigned long flags;
+	unsigned long flags = 0;
 	void *ret = NULL;
 
 	if (!shared->heap_info.initialized) {
@@ -2146,7 +2146,7 @@ EXPORT_SYMBOL(smsm_reset_modem);
 
 void smsm_reset_modem_cont(void)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	uint32_t state;
 
 	if (!smsm_info.state)
@@ -2165,7 +2165,7 @@ static void smsm_cb_snapshot(uint32_t us
 {
 	int n;
 	uint32_t new_state;
-	unsigned long flags;
+	unsigned long flags = 0;
 	int ret;
 
 	ret = kfifo_avail(&smsm_snapshot_fifo);
@@ -2241,7 +2241,7 @@ restore_snapshot_count:
 
 static irqreturn_t smsm_irq_handler(int irq, void *data)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (irq == INT_ADSP_A11_SMSM) {
 		uint32_t mux_val;
@@ -2338,7 +2338,7 @@ int smsm_change_intr_mask(uint32_t smsm_
 			  uint32_t clear_mask, uint32_t set_mask)
 {
 	uint32_t  old_mask, new_mask;
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (smsm_entry >= SMSM_NUM_ENTRIES) {
 		pr_err("smsm_change_state: Invalid entry %d\n",
@@ -2387,7 +2387,7 @@ EXPORT_SYMBOL(smsm_get_intr_mask);
 int smsm_change_state(uint32_t smsm_entry,
 		      uint32_t clear_mask, uint32_t set_mask)
 {
-	unsigned long flags;
+	unsigned long flags = 0;
 	uint32_t  old_state, new_state;
 
 	if (smsm_entry >= SMSM_NUM_ENTRIES) {
@@ -2447,7 +2447,7 @@ void notify_smsm_cb_clients_worker(struc
 	uint32_t state_changes;
 	uint32_t use_wakelock;
 	int ret;
-	unsigned long flags;
+	unsigned long flags = 0;
 
 	if (!smd_initialized)
 		return;
@@ -2579,7 +2579,7 @@ int smsm_state_cb_register(uint32_t smsm
 		new_mask |= LEGACY_MODEM_SMSM_MASK;
 
 	if (smsm_info.intr_mask) {
-		unsigned long flags;
+		unsigned long flags = 0;
 
 		spin_lock_irqsave(&smem_lock, flags);
 		new_mask = (new_mask & ~state->intr_mask_clear)
@@ -2654,7 +2654,7 @@ int smsm_state_cb_deregister(uint32_t sm
 		new_mask |= LEGACY_MODEM_SMSM_MASK;
 
 	if (smsm_info.intr_mask) {
-		unsigned long flags;
+		unsigned long flags = 0;
 
 		spin_lock_irqsave(&smem_lock, flags);
 		new_mask = (new_mask & ~state->intr_mask_clear)