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

Revert "ASoC: wcd_cpe_core: Perform irq cleanup once the bus is up"

Browse source 
This reverts commit 74041210be67 ("ASoC: wcd_cpe_core: Perform irq
cleanup once the bus is up")

CRs-Fixed: 1102353
Change-Id: I7883615b009051c20e11b95b7fca0ef82225e6f5
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
This commit is contained in:
Banajit Goswami 2016-01-06 12:21:13 -08:00 • committed by Bhalchandra Gajare
parent 3162449f7d
commit efdbbff86b
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/codecs/wcd_cpe_core.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2014-2017, 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
@ -891,14 +891,7 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core,
* instead SSR handler will control CPE. * instead SSR handler will control CPE.
*/ */
wcd_cpe_enable_cpe_clks(core, false); wcd_cpe_enable_cpe_clks(core, false);
/* wcd_cpe_cleanup_irqs(core);
* During BUS_DOWN event, possibly the
* irq driver is under cleanup, do not request
* cleanup of irqs here, rather cleanup irqs
* once BUS_UP event is received.
*/
if (core->ssr_type != WCD_CPE_BUS_DOWN_EVENT)
wcd_cpe_cleanup_irqs(core);
goto done; goto done;
} }
@ -1149,7 +1142,6 @@ int wcd_cpe_ssr_event(void *core_handle,
break; break;
case WCD_CPE_BUS_UP_EVENT: case WCD_CPE_BUS_UP_EVENT:
wcd_cpe_cleanup_irqs(core);
wcd_cpe_set_and_complete(core, WCD_CPE_BUS_READY); wcd_cpe_set_and_complete(core, WCD_CPE_BUS_READY);
/* /*
* In case of bus up event ssr_type will be changed * In case of bus up event ssr_type will be changed