diff options
| author | Banajit Goswami <bgoswami@codeaurora.org> | 2016-01-06 12:21:13 -0800 |
|---|---|---|
| committer | Bhalchandra Gajare <gajare@codeaurora.org> | 2017-01-17 11:39:02 -0800 |
| commit | efdbbff86b713b95edc8e343ae12c9639f45e65b (patch) | |
| tree | 051127bca588c777806efdbc3b0646d505a9770c | |
| parent | 3162449f7d245d45f007d4ea3224576ddf1bcc63 (diff) | |
Revert "ASoC: wcd_cpe_core: Perform irq cleanup once the bus is up"
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>
| -rw-r--r-- | sound/soc/codecs/wcd_cpe_core.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/codecs/wcd_cpe_core.c b/sound/soc/codecs/wcd_cpe_core.c index 3aa9ac8d40b6..2088698392de 100644 --- a/sound/soc/codecs/wcd_cpe_core.c +++ b/sound/soc/codecs/wcd_cpe_core.c @@ -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 * 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. */ wcd_cpe_enable_cpe_clks(core, false); - /* - * 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); + wcd_cpe_cleanup_irqs(core); goto done; } @@ -1149,7 +1142,6 @@ int wcd_cpe_ssr_event(void *core_handle, break; case WCD_CPE_BUS_UP_EVENT: - wcd_cpe_cleanup_irqs(core); wcd_cpe_set_and_complete(core, WCD_CPE_BUS_READY); /* * In case of bus up event ssr_type will be changed |