From: Greg Kroah-Hartman Date: Tue, 25 Mar 2014 20:26:01 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.4.85~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92ec3b9156f5f2cafb1ffc92a64b83239fdca3ca;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: alsa-compress-pass-through-return-value-of-open-ops-callback.patch --- diff --git a/queue-3.10/alsa-compress-pass-through-return-value-of-open-ops-callback.patch b/queue-3.10/alsa-compress-pass-through-return-value-of-open-ops-callback.patch new file mode 100644 index 00000000000..78f1d553195 --- /dev/null +++ b/queue-3.10/alsa-compress-pass-through-return-value-of-open-ops-callback.patch @@ -0,0 +1,38 @@ +From 749d32237bf39e6576dd95bfdf24e4378e51716c Mon Sep 17 00:00:00 2001 +From: Charles Keepax +Date: Wed, 19 Mar 2014 12:59:39 +0000 +Subject: ALSA: compress: Pass through return value of open ops callback + +From: Charles Keepax + +commit 749d32237bf39e6576dd95bfdf24e4378e51716c upstream. + +The snd_compr_open function would always return 0 even if the compressed +ops open function failed, obviously this is incorrect. Looks like this +was introduced by a small typo in: + +commit a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85 +ALSA: Add a reference counter to card instance + +This patch returns the value from the compressed op as it should. + +Signed-off-by: Charles Keepax +Acked-by: Vinod Koul +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/compress_offload.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/core/compress_offload.c ++++ b/sound/core/compress_offload.c +@@ -133,7 +133,7 @@ static int snd_compr_open(struct inode * + kfree(data); + } + snd_card_unref(compr->card); +- return 0; ++ return ret; + } + + static int snd_compr_free(struct inode *inode, struct file *f) diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..28f328f3811 --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1 @@ +alsa-compress-pass-through-return-value-of-open-ops-callback.patch diff --git a/queue-3.13/series b/queue-3.13/series new file mode 100644 index 00000000000..502ec852a95 --- /dev/null +++ b/queue-3.13/series @@ -0,0 +1,3 @@ +hid-hidraw-fix-warning-destroying-hidraw-device-files-after-parent.patch +alsa-compress-pass-through-return-value-of-open-ops-callback.patch +clocksource-vf_pit_timer-use-complement-for-sched_clock-reading.patch diff --git a/queue-3.4/series b/queue-3.4/series new file mode 100644 index 00000000000..28f328f3811 --- /dev/null +++ b/queue-3.4/series @@ -0,0 +1 @@ +alsa-compress-pass-through-return-value-of-open-ops-callback.patch