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

Merge "asoc: codecs: Fix LPASS register access during bootup"

Browse source
This commit is contained in:
Linux Build Service Account 2019-09-03 14:02:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit b81152ef29
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/soc/codecs/msm_sdw/msm_sdw_cdc.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1871,7 +1871,8 @@ static int msm_sdw_probe(struct platform_device *pdev)
int adsp_state; int adsp_state;
adsp_state = apr_get_subsys_state(); adsp_state = apr_get_subsys_state();
if (adsp_state != APR_SUBSYS_LOADED) { if (adsp_state != APR_SUBSYS_LOADED ||
!q6core_is_adsp_ready()) {
dev_err(&pdev->dev, "Adsp is not loaded yet %d\n", dev_err(&pdev->dev, "Adsp is not loaded yet %d\n",
adsp_state); adsp_state);
return -EPROBE_DEFER; return -EPROBE_DEFER;

3
sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
View file

@ -4575,7 +4575,8 @@ static int msm_anlg_cdc_probe(struct platform_device *pdev)
int adsp_state; int adsp_state;
adsp_state = apr_get_subsys_state(); adsp_state = apr_get_subsys_state();
if (adsp_state != APR_SUBSYS_LOADED) { if (adsp_state != APR_SUBSYS_LOADED ||
!q6core_is_adsp_ready()) {
dev_err(&pdev->dev, "Adsp is not loaded yet %d\n", dev_err(&pdev->dev, "Adsp is not loaded yet %d\n",
adsp_state); adsp_state);
return -EPROBE_DEFER; return -EPROBE_DEFER;