kernel: alsa: Ensure mutexes are released through error paths

See: raspberrypi/linux#931
raspberrypi · Apr 21, 2015 · 6cc27e0 · 6cc27e0
1 parent 2fe636a
commit 6cc27e0
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/kernel7.img b/boot/kernel7.img
diff --git a/extra/System.map b/extra/System.map
@@ -47701,8 +47701,8 @@ c07ede3c T __initramfs_start
 c07ede3c t __irf_start
 c07ede3c T __security_initcall_end
 c07ede3c T __security_initcall_start
-c07edec0 T __initramfs_size
-c07edec0 t __irf_end
+c07edec2 t __irf_end
+c07edec8 T __initramfs_size
 c07ee000 D __data_loc
 c07ee000 D __init_end
 c07ee000 D _data

diff --git a/extra/System7.map b/extra/System7.map
@@ -48478,7 +48478,7 @@
 807b03b8 t __irf_start
 807b03b8 T __security_initcall_end
 807b03b8 T __security_initcall_start
-807b043c t __irf_end
+807b043e t __irf_end
 807b0440 T __initramfs_size
 807b1000 D __per_cpu_load
 807b1000 D __per_cpu_start

diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-1c5ba896d649812bfe238fe940fe949f50ec1986
+bb6b4b6b331680bed807605685572d727638bb51
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 3.18.11+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #780 PREEMPT Mon Apr 20 14:46:05 BST 2015
+Linux version 3.18.11+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #781 PREEMPT Tue Apr 21 18:02:18 BST 2015
diff --git a/extra/uname_string7 b/extra/uname_string7
@@ -1 +1 @@
-Linux version 3.18.11-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #780 SMP PREEMPT Mon Apr 20 14:59:10 BST 2015
+Linux version 3.18.11-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #781 SMP PREEMPT Tue Apr 21 18:07:59 BST 2015
diff --git a/modules/3.18.11+/kernel/sound/arm/snd-bcm2835.ko b/modules/3.18.11+/kernel/sound/arm/snd-bcm2835.ko
diff --git a/modules/3.18.11-v7+/kernel/sound/arm/snd-bcm2835.ko b/modules/3.18.11-v7+/kernel/sound/arm/snd-bcm2835.ko
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1c5ba896d649812bfe238fe940fe949f50ec1986
		bb6b4b6b331680bed807605685572d727638bb51
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 3.18.11+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #780 PREEMPT Mon Apr 20 14:46:05 BST 2015
		Linux version 3.18.11+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #781 PREEMPT Tue Apr 21 18:02:18 BST 2015
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 3.18.11-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #780 SMP PREEMPT Mon Apr 20 14:59:10 BST 2015
		Linux version 3.18.11-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #781 SMP PREEMPT Tue Apr 21 18:07:59 BST 2015