Skip to contentSkip to conversation

echoaudio - minor changes

PATCH New Giuliano Pochini 1 participant 1 message Jan 14, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 4/4 echoaudio - minor changes

Check for more error conditions during hw init, expecially when debugging is enabled.

pci/echoaudio/echo3g_dsp.c +7 -4
diff -dup alsa-driver__indi2/pci/echoaudio/echo3g_dsp.c alsa-driver/pci/echoaudio/echo3g_dsp.c
@@ -98,10 +98,13 @@ static int init_hw(struct echoaudio *chi
 	chip->non_audio_spdif = FALSE;
 	chip->bad_board = FALSE;
 
-	err = init_line_levels(chip);
-	set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-	set_phantom_power(chip, 0);
-	set_professional_spdif(chip, TRUE);
+	if ((err = init_line_levels(chip)) < 0)
+		return err;
+	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	snd_assert(err >= 0, return err);
+	err = set_phantom_power(chip, 0);
+	snd_assert(err >= 0, return err);
+	err = set_professional_spdif(chip, TRUE);
 
 	DE_INIT(("init_hw done\n"));
 	return err;
pci/echoaudio/gina24_dsp.c +4 -2
diff -dup alsa-driver__indi2/pci/echoaudio/gina24_dsp.c alsa-driver/pci/echoaudio/gina24_dsp.c
@@ -76,8 +76,10 @@ static int init_hw(struct echoaudio *chi
 		return err;
 	chip->bad_board = FALSE;
 
-	err = init_line_levels(chip);
-	set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	if ((err = init_line_levels(chip)) < 0)
+		return err;
+	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	snd_assert(err >= 0, return err);
 	err = set_professional_spdif(chip, TRUE);
 
 	DE_INIT(("init_hw done\n"));
pci/echoaudio/indigo_dsp.c +1 -1
diff -dup alsa-driver__indi2/pci/echoaudio/indigo_dsp.c alsa-driver/pci/echoaudio/indigo_dsp.c
@@ -69,7 +69,7 @@ static int init_hw(struct echoaudio *chi
 	set_vmixer_gain(chip, 1, 5, 0);
 	set_vmixer_gain(chip, 0, 6, 0);
 	set_vmixer_gain(chip, 1, 7, 0);
-	update_vmixer_level(chip);
+	err = update_vmixer_level(chip);
 
 	DE_INIT(("init_hw done\n"));
 	return err;
pci/echoaudio/indigodj_dsp.c +1 -1
diff -dup alsa-driver__indi2/pci/echoaudio/indigodj_dsp.c alsa-driver/pci/echoaudio/indigodj_dsp.c
@@ -69,7 +69,7 @@ static int init_hw(struct echoaudio *chi
 	set_vmixer_gain(chip, 1, 5, 0);
 	set_vmixer_gain(chip, 2, 6, 0);
 	set_vmixer_gain(chip, 3, 7, 0);
-	update_vmixer_level(chip);
+	err = update_vmixer_level(chip);
 
 	DE_INIT(("init_hw done\n"));
 	return err;
pci/echoaudio/indigoio_dsp.c +1 -1
diff -dup alsa-driver__indi2/pci/echoaudio/indigoio_dsp.c alsa-driver/pci/echoaudio/indigoio_dsp.c
@@ -69,7 +69,7 @@ static int init_hw(struct echoaudio *chi
 	set_vmixer_gain(chip, 1, 5, 0);
 	set_vmixer_gain(chip, 0, 6, 0);
 	set_vmixer_gain(chip, 1, 7, 0);
-	update_vmixer_level(chip);
+	err = update_vmixer_level(chip);
 
 	DE_INIT(("init_hw done\n"));
 	return err;
pci/echoaudio/layla24_dsp.c +2 -1
diff -dup alsa-driver__indi2/pci/echoaudio/layla24_dsp.c alsa-driver/pci/echoaudio/layla24_dsp.c
@@ -69,7 +69,8 @@ static int init_hw(struct echoaudio *chi
 	if ((err = init_line_levels(chip)) < 0)
 		return err;
 
-	set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	snd_assert(err >= 0, return err);
 	err = set_professional_spdif(chip, TRUE);
 
 	DE_INIT(("init_hw done\n"));
pci/echoaudio/mona_dsp.c +2 -1
diff -dup alsa-driver__indi2/pci/echoaudio/mona_dsp.c alsa-driver/pci/echoaudio/mona_dsp.c
@@ -74,7 +74,8 @@ static int init_hw(struct echoaudio *chi
 	if ((err = init_line_levels(chip)) < 0)
 		return err;
 
-	set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
+	snd_assert(err >= 0, return err);
 	err = set_professional_spdif(chip, TRUE);
 
 	DE_INIT(("init_hw done\n"));

--
Giuliano.

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click