1 From f491fbf4315a1d4a7210450f835a6fe93880cd5b Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Fri, 12 Aug 2016 15:46:21 +0100
4 Subject: [PATCH] snd-bcm2835: Don't allow responses from VC to be interrupted
7 There should always be a response, and retry after a signal interruption is not handled, so don't report
10 See: https://github.com/raspberrypi/linux/issues/1560
12 sound/arm/bcm2835-vchiq.c | 25 ++++++-------------------
13 1 file changed, 6 insertions(+), 19 deletions(-)
15 --- a/sound/arm/bcm2835-vchiq.c
16 +++ b/sound/arm/bcm2835-vchiq.c
17 @@ -511,12 +511,7 @@ static int bcm2835_audio_set_ctls_chan(b
20 /* We are expecting a reply from the videocore */
21 - ret = wait_for_completion_interruptible(&instance->msg_avail_comp);
23 - LOG_DBG("%s: failed on waiting for event (status=%d)\n",
27 + wait_for_completion(&instance->msg_avail_comp);
29 if (instance->result != 0) {
30 LOG_ERR("%s: result=%d\n", __func__, instance->result);
31 @@ -615,12 +610,7 @@ int bcm2835_audio_set_params(bcm2835_als
34 /* We are expecting a reply from the videocore */
35 - ret = wait_for_completion_interruptible(&instance->msg_avail_comp);
37 - LOG_DBG("%s: failed on waiting for event (status=%d)\n",
41 + wait_for_completion(&instance->msg_avail_comp);
43 if (instance->result != 0) {
44 LOG_ERR("%s: result=%d", __func__, instance->result);
45 @@ -761,14 +751,11 @@ int bcm2835_audio_close(bcm2835_alsa_str
49 - ret = wait_for_completion_interruptible(&instance->msg_avail_comp);
51 - LOG_DBG("%s: failed on waiting for event (status=%d)\n",
55 + /* We are expecting a reply from the videocore */
56 + wait_for_completion(&instance->msg_avail_comp);
58 if (instance->result != 0) {
59 - LOG_ERR("%s: failed result (status=%d)\n",
60 + LOG_ERR("%s: failed result (result=%d)\n",
61 __func__, instance->result);