diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-04-24 13:03:39 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-04-24 13:03:39 +0200 |
| commit | 525b311bf869d7e252d744e501e227263a955c8e (patch) | |
| tree | 4c644f534e5b577b9256d26b1e9a2e4a0453698e /target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch | |
| parent | 0ab31bfced9666f3fb58acdb5833a93e4f4f5f7e (diff) | |
| download | upstream-525b311bf869d7e252d744e501e227263a955c8e.tar.gz upstream-525b311bf869d7e252d744e501e227263a955c8e.tar.bz2 upstream-525b311bf869d7e252d744e501e227263a955c8e.zip | |
brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted from the raspberry pi repo:
https://github.com/raspberrypi/linux/tree/rpi-4.4.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch b/target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch new file mode 100644 index 0000000000..97e70f820a --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0249-bcm2835-do-not-require-substream-for-accessing-chmap.patch @@ -0,0 +1,51 @@ +From 74f05075c9f20865651019acc76ac0cf957eebbf Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@nowhere> +Date: Tue, 19 Apr 2016 16:08:35 +0200 +Subject: [PATCH 249/304] bcm2835: do not require substream for accessing chmap + ctl + +Fixes alsasctl store/restore operation. +--- + sound/arm/bcm2835-ctl.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +--- a/sound/arm/bcm2835-ctl.c ++++ b/sound/arm/bcm2835-ctl.c +@@ -489,8 +489,6 @@ static int snd_bcm2835_chmap_ctl_get(str + { + struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); + bcm2835_chip_t *chip = info->private_data; +- unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); +- struct snd_pcm_substream *substream = snd_pcm_chmap_substream(info, idx); + struct cea_channel_speaker_allocation *ch = NULL; + int res = 0; + int cur = 0; +@@ -499,11 +497,6 @@ static int snd_bcm2835_chmap_ctl_get(str + if (mutex_lock_interruptible(&chip->audio_mutex)) + return -EINTR; + +- if (!substream || !substream->runtime) { +- res = -ENODEV; +- goto unlock; +- } +- + for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) { + if (channel_allocations[i].ca_index == chip->cea_chmap) + ch = &channel_allocations[i]; +@@ -521,7 +514,6 @@ static int snd_bcm2835_chmap_ctl_get(str + while (cur < 8) + ucontrol->value.integer.value[cur++] = SNDRV_CHMAP_NA; + +-unlock: + mutex_unlock(&chip->audio_mutex); + return res; + } +@@ -541,7 +533,7 @@ static int snd_bcm2835_chmap_ctl_put(str + return -EINTR; + + if (!substream || !substream->runtime) { +- res = -ENODEV; ++ /* ignore and return success for the sake of alsactl */ + goto unlock; + } + |