summaryrefslogtreecommitdiff
path: root/packages/dsplink/files/do-not-panic-on-mixer-failure.patch
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2009-02-16 10:03:32 -0500
committerCliff Brake <cbrake@bec-systems.com>2009-02-16 10:03:32 -0500
commitd512927cbf42dc9a3302ecac790a18d397ea012f (patch)
tree2d624d29a763e5f9ae9b618148cfc6063e6cd50e /packages/dsplink/files/do-not-panic-on-mixer-failure.patch
parent68e1ea7aeddc4f7efc621558dfd424cd2fe22674 (diff)
parent3fe1150b7afa91ee59dfa6346c1f7387638b7817 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/dsplink/files/do-not-panic-on-mixer-failure.patch')
-rw-r--r--packages/dsplink/files/do-not-panic-on-mixer-failure.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/packages/dsplink/files/do-not-panic-on-mixer-failure.patch b/packages/dsplink/files/do-not-panic-on-mixer-failure.patch
new file mode 100644
index 0000000000..20e1aece72
--- /dev/null
+++ b/packages/dsplink/files/do-not-panic-on-mixer-failure.patch
@@ -0,0 +1,31 @@
+Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c
+===================================================================
+--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:23.000000000 -0600
++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:25.000000000 -0600
+@@ -139,7 +139,7 @@
+
+ snd_mixer_selem_id_free (sid);
+ snd_mixer_close (rcMixer);
+-
++
+ return Dmai_EOK;
+ }
+
+@@ -431,14 +431,13 @@
+ Sound_alsa_delete(hSound);
+ return NULL;
+ }
+-
++
+ if (setMixerVolume (attrs) <0) {
+- Sound_alsa_delete (hSound);
+- return NULL;
++ Dmai_dbg2("Failed to set the mixer volume on %s (%s)\n",
++ AUDIO_DEVICE, snd_strerror(status));
+ }
+ }
+
+-
+ return hSound;
+ }
+