evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb_bam: Avoid uninitialized variable errors"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-02 14:41:32 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7a4ed459e7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/platform/msm/usb_bam.c
View file

@ -1323,6 +1323,9 @@ static void usb_bam_finish_suspend(enum usb_ctrl cur_bam)
__func__, ret); __func__, ret);
goto no_lpm; goto no_lpm;
} }
} else {
log_event_err("%s: pipe type is not B2B\n", __func__);
cons_empty = true;
} }
spin_lock(&usb_bam_ipa_handshake_info_lock); spin_lock(&usb_bam_ipa_handshake_info_lock);
@ -1959,8 +1962,8 @@ static void usb_bam_finish_resume(struct work_struct *w)
spin_unlock(&usb_bam_ipa_handshake_info_lock); spin_unlock(&usb_bam_ipa_handshake_info_lock);
mutex_unlock(&info[cur_bam].suspend_resume_mutex); mutex_unlock(&info[cur_bam].suspend_resume_mutex);
log_event_dbg("%s: done..PM Runtime PUT %d, count: %d\n", log_event_dbg("%s: done..PM Runtime PUT :%d\n",
__func__, idx, get_pm_runtime_counter(bam_dev)); __func__, get_pm_runtime_counter(bam_dev));
/* Put to match _get at the beginning of this routine */ /* Put to match _get at the beginning of this routine */
pm_runtime_put(&ctx->usb_bam_pdev->dev); pm_runtime_put(&ctx->usb_bam_pdev->dev);
} }
@ -2762,16 +2765,14 @@ static void usb_bam_sps_events(enum sps_callback_case sps_cb_case, void *user)
log_event_dbg("%s: received SPS_CALLBACK_BAM_TIMER_IRQ\n", log_event_dbg("%s: received SPS_CALLBACK_BAM_TIMER_IRQ\n",
__func__); __func__);
spin_lock(&ctx->usb_bam_lock);
bam = get_bam_type_from_core_name((char *)user); bam = get_bam_type_from_core_name((char *)user);
if (bam < 0 || bam >= MAX_BAMS) { if (bam < 0 || bam >= MAX_BAMS) {
log_event_err("%s: Invalid bam, type=%d ,name=%s\n", log_event_err("%s: Invalid bam, type=%d ,name=%s\n",
__func__, bam, (char *)user); __func__, bam, (char *)user);
spin_unlock(&ctx->usb_bam_lock);
return; return;
} }
ctx = &msm_usb_bam[bam]; ctx = &msm_usb_bam[bam];
spin_lock(&ctx->usb_bam_lock);
ctx->is_bam_inactivity = true; ctx->is_bam_inactivity = true;
log_event_dbg("%s: Inactivity happened on bam=%s,%d\n", log_event_dbg("%s: Inactivity happened on bam=%s,%d\n",