summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_dsp_proxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/fsl/fsl_dsp_proxy.c')
-rw-r--r--sound/soc/fsl/fsl_dsp_proxy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_dsp_proxy.c b/sound/soc/fsl/fsl_dsp_proxy.c
index 1f4390487c78..94bffc06c608 100644
--- a/sound/soc/fsl/fsl_dsp_proxy.c
+++ b/sound/soc/fsl/fsl_dsp_proxy.c
@@ -557,12 +557,13 @@ struct xf_message *xf_cmd_recv(struct xf_proxy *proxy,
struct xf_msg_queue *queue,
int wait)
{
- struct xf_message *m;
+ struct xf_message *m = NULL;
int ret;
/* ...wait for message reception (take lock on success) */
ret = wait_event_interruptible(*wq,
- (m = xf_msg_received(proxy, queue)) != NULL || !wait);
+ (m = xf_msg_received(proxy, queue)) != NULL || !wait
+ || !proxy->is_active);
if (ret)
return ERR_PTR(-EINTR);