Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...
[vuplus_openembedded] / packages / dsplink / files / dmai-do-not-panic-on-mixer-failure.patch
1 Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c
2 ===================================================================
3 --- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Sound_alsa.c        2009-02-11 19:19:23.000000000 -0600
4 +++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c     2009-02-11 19:19:25.000000000 -0600
5 @@ -139,7 +139,7 @@
6  
7      snd_mixer_selem_id_free (sid);
8      snd_mixer_close (rcMixer);
9 -
10 +      
11      return Dmai_EOK;
12  }
13  
14 @@ -431,14 +431,13 @@
15              Sound_alsa_delete(hSound);
16              return NULL;
17          }
18 -
19 +        
20          if (setMixerVolume (attrs) <0) {
21 -            Sound_alsa_delete (hSound);
22 -            return NULL;
23 +            Dmai_dbg2("Failed to set the mixer volume on %s (%s)\n",
24 +                AUDIO_DEVICE, snd_strerror(status));
25          }
26      }
27  
28 -
29      return hSound;
30  }
31