Merge pull request #859 from angolini/hardknott+bsp

Backport NXP BSP 5.10.35_2.0.0 to Hardknott

1 files changed, 9 insertions, 11 deletions

diff --git a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
index 4d28a77f..1d58aeba 100755..100644
--- a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
@@ -1,7 +1,7 @@
-From 93607819d90ddf9bbdad8bbbe4af5d917ca572dc Mon Sep 17 00:00:00 2001
+From 754e0c6112a181b30bd46aa13812f37db01c3387 Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <shengjiu.wang@freescale.com>
 Date: Tue, 10 May 2016 15:09:26 +0800
-Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
+Subject: [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
 
 The resume function don't update the dmix->state, if store SUSPENDED
 state in snd_pcm_dmix_state, the write function after resume will
@@ -13,6 +13,7 @@ for dmix,dshare,dsnoop.
 Upstream-Status: Pending
 
 Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
+
 ---
  src/pcm/pcm_dmix.c   | 2 +-
  src/pcm/pcm_dshare.c | 2 +-
@@ -20,10 +21,10 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
-index a6a8f3a..89c07d1 100644
+index 5b7472d..e08e46f 100644
 --- a/src/pcm/pcm_dmix.c
 +++ b/src/pcm/pcm_dmix.c
-@@ -466,9 +466,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
+@@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
         snd_pcm_state_t state;
         state = snd_pcm_state(dmix->spcm);
         switch (state) {
@@ -35,10 +36,10 @@ index a6a8f3a..89c07d1 100644
         case SND_PCM_STATE_XRUN:
                 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0)
 diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
-index 7cdfea2..e0b4ea7 100644
+index 8a67257..8ba61b4 100644
 --- a/src/pcm/pcm_dshare.c
 +++ b/src/pcm/pcm_dshare.c
-@@ -261,9 +261,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
+@@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
         snd_pcm_state_t state;
         state = snd_pcm_state(dshare->spcm);
         switch (state) {
@@ -50,10 +51,10 @@ index 7cdfea2..e0b4ea7 100644
         case SND_PCM_STATE_XRUN:
                 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0)
 diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
-index 539b671..03df6ff 100644
+index c6e8cd2..9610482 100644
 --- a/src/pcm/pcm_dsnoop.c
 +++ b/src/pcm/pcm_dsnoop.c
-@@ -212,9 +212,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
+@@ -208,9 +208,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
         snd_pcm_state_t state;
         state = snd_pcm_state(dsnoop->spcm);
         switch (state) {
@@ -64,6 +65,3 @@ index 539b671..03df6ff 100644
                 return state;
         case SND_PCM_STATE_XRUN:
                 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0)
--- 
-2.7.4
-