delete asoc-wm8731-init-mutex-in-i2c-init-path.patch

diff --git a/queue-3.10/asoc-wm8731-init-mutex-in-i2c-init-path.patch b/queue-3.10/asoc-wm8731-init-mutex-in-i2c-init-path.patch
deleted file mode 100644 (file)
index e76ea26..0000000
--- a/queue-3.10/asoc-wm8731-init-mutex-in-i2c-init-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8a6cf30bf93df2c0f2637156e4a5070594bddebf Mon Sep 17 00:00:00 2001
-From: Manuel Lauss <manuel.lauss@gmail.com>
-Date: Mon, 19 Jan 2015 08:23:43 +0100
-Subject: ASoC: wm8731: init mutex in i2c init path
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-commit 8a6cf30bf93df2c0f2637156e4a5070594bddebf upstream.
-
-The I2C init path forgot to init the mutex, leading to an oops when
-controls are accessed.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/wm8731.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sound/soc/codecs/wm8731.c
-+++ b/sound/soc/codecs/wm8731.c
-@@ -690,6 +690,8 @@ static int wm8731_i2c_probe(struct i2c_c
-       if (wm8731 == NULL)
-               return -ENOMEM;
- 
-+      mutex_init(&wm8731->lock);
-+
-       wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
-       if (IS_ERR(wm8731->regmap)) {
-               ret = PTR_ERR(wm8731->regmap);

diff --git a/queue-3.10/series b/queue-3.10/series
index 0a4d20455ba15556c82aa52f7e5b63b6afafc514..c54bb21e8d3da184debf67ea0a2ada9dd17e4eb7 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -9,7 +9,6 @@ nilfs2-fix-deadlock-of-segment-constructor-over-i_sync-flag.patch
 arm64-fix-up-proc-cpuinfo.patch
 ext4-prevent-bugon-on-race-between-write-fcntl.patch
 lib-checksum.c-fix-build-for-generic-csum_tcpudp_nofold.patch
-asoc-wm8731-init-mutex-in-i2c-init-path.patch
 asoc-atmel_ssc_dai-fix-start-event-for-i2s-mode.patch
 asoc-sgtl5000-add-delay-before-first-i2c-access.patch
 alsa-ak411x-fix-stall-in-work-callback.patch

diff --git a/queue-3.14/asoc-wm8731-init-mutex-in-i2c-init-path.patch b/queue-3.14/asoc-wm8731-init-mutex-in-i2c-init-path.patch
deleted file mode 100644 (file)
index 34ee39c..0000000
--- a/queue-3.14/asoc-wm8731-init-mutex-in-i2c-init-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8a6cf30bf93df2c0f2637156e4a5070594bddebf Mon Sep 17 00:00:00 2001
-From: Manuel Lauss <manuel.lauss@gmail.com>
-Date: Mon, 19 Jan 2015 08:23:43 +0100
-Subject: ASoC: wm8731: init mutex in i2c init path
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-commit 8a6cf30bf93df2c0f2637156e4a5070594bddebf upstream.
-
-The I2C init path forgot to init the mutex, leading to an oops when
-controls are accessed.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/wm8731.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sound/soc/codecs/wm8731.c
-+++ b/sound/soc/codecs/wm8731.c
-@@ -744,6 +744,8 @@ static int wm8731_i2c_probe(struct i2c_c
-       if (wm8731 == NULL)
-               return -ENOMEM;
- 
-+      mutex_init(&wm8731->lock);
-+
-       wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
-       if (IS_ERR(wm8731->regmap)) {
-               ret = PTR_ERR(wm8731->regmap);

diff --git a/queue-3.14/series b/queue-3.14/series
index 72c97ec84df20792913b983810c2f466ec35f338..8b34da0f317c21ccd9410b4c80999e630e46a50e 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -13,7 +13,6 @@ kconfig-fix-warning-jump-may-be-used-uninitialized.patch
 arm64-fix-up-proc-cpuinfo.patch
 ext4-prevent-bugon-on-race-between-write-fcntl.patch
 lib-checksum.c-fix-build-for-generic-csum_tcpudp_nofold.patch
-asoc-wm8731-init-mutex-in-i2c-init-path.patch
 asoc-atmel_ssc_dai-fix-start-event-for-i2s-mode.patch
 asoc-sgtl5000-add-delay-before-first-i2c-access.patch
 alsa-ak411x-fix-stall-in-work-callback.patch

diff --git a/queue-3.18/asoc-wm8731-init-mutex-in-i2c-init-path.patch b/queue-3.18/asoc-wm8731-init-mutex-in-i2c-init-path.patch
deleted file mode 100644 (file)
index b9ea2ee..0000000
--- a/queue-3.18/asoc-wm8731-init-mutex-in-i2c-init-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8a6cf30bf93df2c0f2637156e4a5070594bddebf Mon Sep 17 00:00:00 2001
-From: Manuel Lauss <manuel.lauss@gmail.com>
-Date: Mon, 19 Jan 2015 08:23:43 +0100
-Subject: ASoC: wm8731: init mutex in i2c init path
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-commit 8a6cf30bf93df2c0f2637156e4a5070594bddebf upstream.
-
-The I2C init path forgot to init the mutex, leading to an oops when
-controls are accessed.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/wm8731.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sound/soc/codecs/wm8731.c
-+++ b/sound/soc/codecs/wm8731.c
-@@ -734,6 +734,8 @@ static int wm8731_i2c_probe(struct i2c_c
-       if (wm8731 == NULL)
-               return -ENOMEM;
- 
-+      mutex_init(&wm8731->lock);
-+
-       wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
-       if (IS_ERR(wm8731->regmap)) {
-               ret = PTR_ERR(wm8731->regmap);

diff --git a/queue-3.18/series b/queue-3.18/series
index 788d926dd2c80da96f64c02a34bfe4797ae7783a..b023cf6aa0116ba8aaf14c1756535e4178438b72 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -27,7 +27,6 @@ drm-radeon-properly-set-vm-fragment-size-for-tn-rl.patch
 kconfig-fix-warning-jump-may-be-used-uninitialized.patch
 arm64-fix-up-proc-cpuinfo.patch
 lib-checksum.c-fix-build-for-generic-csum_tcpudp_nofold.patch
-asoc-wm8731-init-mutex-in-i2c-init-path.patch
 asoc-atmel_ssc_dai-fix-start-event-for-i2s-mode.patch
 asoc-sgtl5000-add-delay-before-first-i2c-access.patch
 alsa-ak411x-fix-stall-in-work-callback.patch