diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-19 09:52:40 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-19 09:52:40 -0800 |
| commit | 49d49b15a542e22a075d548f7a489e96593ee412 (patch) | |
| tree | 8e56cac2845b28d95e9a799c1d2838dd1bd4b8e6 /sound | |
| parent | 29bcd5781b7f2992510a684d8fad683dd0804ea9 (diff) | |
| parent | 76771ab5ac87148a0f888c357029e13bdab395c4 (diff) | |
Merge "mfd: wcd9xxx: send down notification to devices before cleaning-up IRQs"
Diffstat (limited to 'sound')
| -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 |