# HG changeset patch # User reimar # Date 1304803402 0 # Node ID f60b1fd077128d3cf1b55f4bffb32d8613c98504 # Parent 780f64c1ac7ea949a111cb675ed635bc80b12b3b Simplify code and avoid an incorrect "may be used initialized" gcc warning. diff -r 780f64c1ac7e -r f60b1fd07712 libao2/ao_alsa.c --- a/libao2/ao_alsa.c Sat May 07 21:15:13 2011 +0000 +++ b/libao2/ao_alsa.c Sat May 07 21:23:22 2011 +0000 @@ -300,11 +300,10 @@ err = snd_pcm_open(&alsa_handler, ac3_device, SND_PCM_STREAM_PLAYBACK, open_mode); free(ac3_device); + if (err >= 0) + return err; } - if (!try_ac3 || err < 0) - err = snd_pcm_open(&alsa_handler, device, SND_PCM_STREAM_PLAYBACK, - open_mode); - return err; + return snd_pcm_open(&alsa_handler, device, SND_PCM_STREAM_PLAYBACK, open_mode); } /*