remove asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch

diff --git a/queue-3.10/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch b/queue-3.10/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
deleted file mode 100644 (file)
index af1aa16..0000000
--- a/queue-3.10/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e4ad1accb28d0ed8cea6f12395d58686ad344ca7 Mon Sep 17 00:00:00 2001
-From: Patrick Lai <plai@codeaurora.org>
-Date: Sun, 2 Mar 2014 11:52:57 -0800
-Subject: ASoC: pcm: free path list before exiting from error conditions
-
-From: Patrick Lai <plai@codeaurora.org>
-
-commit e4ad1accb28d0ed8cea6f12395d58686ad344ca7 upstream.
-
-dpcm_path_get() allocates dynamic memory to hold path list.
-Corresponding dpcm_path_put() must be called to free the memory.
-dpcm_path_put() is not called under several error conditions.
-This leads to memory leak.
-
-Signed-off-by: Patrick Lai <plai@codeaurora.org>
-Signed-off-by: Mark Brown <broonie@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/soc-pcm.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/soc/soc-pcm.c
-+++ b/sound/soc/soc-pcm.c
-@@ -1864,6 +1864,7 @@ int soc_dpcm_runtime_update(struct snd_s
- 
-               paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
-               if (paths < 0) {
-+                      dpcm_path_put(&list);
-                       dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
-                                       fe->dai_link->name,  "playback");
-                       mutex_unlock(&card->mutex);
-@@ -1893,6 +1894,7 @@ capture:
- 
-               paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
-               if (paths < 0) {
-+                      dpcm_path_put(&list);
-                       dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
-                                       fe->dai_link->name,  "capture");
-                       mutex_unlock(&card->mutex);
-@@ -1957,6 +1959,7 @@ static int dpcm_fe_dai_open(struct snd_p
-       fe->dpcm[stream].runtime = fe_substream->runtime;
- 
-       if (dpcm_path_get(fe, stream, &list) <= 0) {
-+              dpcm_path_put(&list);
-               dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
-                       fe->dai_link->name, stream ? "capture" : "playback");
-       }

diff --git a/queue-3.10/series b/queue-3.10/series
index cbde6c52f1b44497edbd2ab7286e2a07c053b5ce..c9b0db670d8177a79b6bf503e6695557bf116d05 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -53,7 +53,6 @@ acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch
 iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch
 fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch
 drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
-asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
 ipc-fix-2-bugs-in-msgrcv-msg_copy-implementation.patch
 kvm-svm-fix-cr8-intercept-window.patch
 pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch

diff --git a/queue-3.13/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch b/queue-3.13/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
deleted file mode 100644 (file)
index a33e1fe..0000000
--- a/queue-3.13/asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e4ad1accb28d0ed8cea6f12395d58686ad344ca7 Mon Sep 17 00:00:00 2001
-From: Patrick Lai <plai@codeaurora.org>
-Date: Sun, 2 Mar 2014 11:52:57 -0800
-Subject: ASoC: pcm: free path list before exiting from error conditions
-
-From: Patrick Lai <plai@codeaurora.org>
-
-commit e4ad1accb28d0ed8cea6f12395d58686ad344ca7 upstream.
-
-dpcm_path_get() allocates dynamic memory to hold path list.
-Corresponding dpcm_path_put() must be called to free the memory.
-dpcm_path_put() is not called under several error conditions.
-This leads to memory leak.
-
-Signed-off-by: Patrick Lai <plai@codeaurora.org>
-Signed-off-by: Mark Brown <broonie@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/soc-pcm.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sound/soc/soc-pcm.c
-+++ b/sound/soc/soc-pcm.c
-@@ -1886,6 +1886,7 @@ int soc_dpcm_runtime_update(struct snd_s
- 
-               paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
-               if (paths < 0) {
-+                      dpcm_path_put(&list);
-                       dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
-                                       fe->dai_link->name,  "playback");
-                       mutex_unlock(&card->mutex);
-@@ -1915,6 +1916,7 @@ capture:
- 
-               paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
-               if (paths < 0) {
-+                      dpcm_path_put(&list);
-                       dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
-                                       fe->dai_link->name,  "capture");
-                       mutex_unlock(&card->mutex);
-@@ -1979,6 +1981,7 @@ static int dpcm_fe_dai_open(struct snd_p
-       fe->dpcm[stream].runtime = fe_substream->runtime;
- 
-       if (dpcm_path_get(fe, stream, &list) <= 0) {
-+              dpcm_path_put(&list);
-               dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
-                       fe->dai_link->name, stream ? "capture" : "playback");
-       }

diff --git a/queue-3.13/series b/queue-3.13/series
index 133951a8dac59e3b0ac0cca8806487bfdc87ebe1..6c98d5faa7b85e35b26dbb695a371dd250f07fb5 100644 (file)
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@ -107,7 +107,6 @@ drm-radeon-cik-stop-the-sdma-engines-in-the-enable-function.patch
 drm-radeon-cik-properly-set-compute-ring-status-on-disable.patch
 drm-radeon-fix-minor-typos-in-si_dpm.c.patch
 drm-radeon-si-fix-typo-in-dpm-sq-ramping-setup.patch
-asoc-pcm-free-path-list-before-exiting-from-error-conditions.patch
 asoc-88pm860-fix-io-setup.patch
 asoc-si476x-fix-io-setup.patch
 i2c-remove-usage-of-orphaned-symbol-of_i2c.patch