From: Greg Kroah-Hartman Date: Mon, 9 Feb 2015 08:16:57 +0000 (+0800) Subject: delete asoc-wm8731-init-mutex-in-i2c-init-path.patch X-Git-Tag: v3.10.69~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1b6413f1b2f38fdc3ad45ea5aba1e872ae73b9d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index e76ea26dbbb..00000000000 --- 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 -Date: Mon, 19 Jan 2015 08:23:43 +0100 -Subject: ASoC: wm8731: init mutex in i2c init path - -From: Manuel Lauss - -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 -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - 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 0a4d20455ba..c54bb21e8d3 100644 --- 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 index 34ee39cb07b..00000000000 --- 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 -Date: Mon, 19 Jan 2015 08:23:43 +0100 -Subject: ASoC: wm8731: init mutex in i2c init path - -From: Manuel Lauss - -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 -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - 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 72c97ec84df..8b34da0f317 100644 --- 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 index b9ea2ee1d56..00000000000 --- 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 -Date: Mon, 19 Jan 2015 08:23:43 +0100 -Subject: ASoC: wm8731: init mutex in i2c init path - -From: Manuel Lauss - -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 -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - 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 788d926dd2c..b023cf6aa01 100644 --- 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