X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_mix.c;h=c44c74f9d67a3feca3dd775d5e240e5fec431754;hp=5a5835463e22b752cad9379776c98fc16338d9b3;hb=47a9983cc65ef57ad25c4ba3e16cabe48fd57b23;hpb=107d4619b3a6a8bdc1a85c8021cb1951244e7626

diff --git a/alsa_mix.c b/alsa_mix.c
index 5a583546..c44c74f9 100644
--- a/alsa_mix.c
+++ b/alsa_mix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -141,19 +141,19 @@ static int alsa_mix_set_channel(struct mixer_handle *h,
 		PARA_NOTICE_LOG("unable to find simple control '%s',%i\n",
 			snd_mixer_selem_id_get_name(sid),
 			snd_mixer_selem_id_get_index(sid));
-		return -E_ALSA_MIX_BAD_ELEM;
+		return -E_BAD_CHANNEL;
 	}
 	ret = snd_mixer_selem_get_playback_volume_range(h->elem,
 		&h->pmin, &h->pmax);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("unable to get %s range (%s): %s\n",
 			mixer_channel, h->card, snd_strerror(ret));
-		return -E_ALSA_MIX_BAD_ELEM;
+		return -E_ALSA_MIX_RANGE;
 	}
-	if (h->pmin < 0 || h->pmax < 0 || h->pmin >= h->pmax) {
+	if (h->pmin >= h->pmax) {
 		PARA_NOTICE_LOG("alsa reported %s range %ld-%ld (%s)\n",
 			mixer_channel, h->pmin, h->pmax, h->card);
-		return -E_ALSA_MIX_BAD_ELEM;
+		return -E_ALSA_MIX_RANGE;
 	}
 	return 1;
 }