Skip to contentSkip to conversation

ALSA: ice1712: consider error value

PATCH Superseded Sudip Mukherjee 2 participants 2 messages Nov 14, 2014 Sound

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ALSA: ice1712: consider error value

earlier we were ignoring the return value of snd_ak4114_create and always returning 0.
now we are returning the actual status. revo_init is calling this function, and revo_init is checking the return value.

---

change in v3: spec->ak4114 is now dereferenced if we dont get an error value from snd_ak4114_create.

 sound/pci/ice1712/revo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/ice1712/revo.c +3 -2
index 1112ec1..24a7c6a 100644
@@ -496,9 +496,10 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice)
 				 ice, &spec->ak4114);
 	/* AK4114 in Revo cannot detect external rate correctly.
 	 * No reason to stop capture stream due to incorrect checks */
-	spec->ak4114->check_flags = AK4114_CHECK_NO_RATE;
+	if (err == 0)
+		spec->ak4114->check_flags = AK4114_CHECK_NO_RATE;
 
-	return 0; /* error ignored; it's no fatal error */
+	return err;
 }
 
 static int revo_init(struct snd_ice1712 *ice)
Signature · 1 line
1.8.1.2
#1 lore raw

At Fri, 14 Nov 2014 16:56:49 +0530,

Quoted 11 lines · Sudip Mukherjee

earlier we were ignoring the return value of snd_ak4114_create and always returning 0.
now we are returning the actual status. revo_init is calling this function, and revo_init is checking the return value.

---

change in v3: spec->ak4114 is now dereferenced if we dont get an error value from snd_ak4114_create.

Well, it's more common to put

	if (err < 0)
		return err;

after snd_ak4114_create(). Using a different coding style confuses readers.

Takashi

Quoted 24 lines
 sound/pci/ice1712/revo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/ice1712/revo.c +3 -2
index 1112ec1..24a7c6a 100644
@@ -496,9 +496,10 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice)
 				 ice, &spec->ak4114);
 	/* AK4114 in Revo cannot detect external rate correctly.
 	 * No reason to stop capture stream due to incorrect checks */
-	spec->ak4114->check_flags = AK4114_CHECK_NO_RATE;
+	if (err == 0)
+		spec->ak4114->check_flags = AK4114_CHECK_NO_RATE;
 
-	return 0; /* error ignored; it's no fatal error */
+	return err;
 }
 
 static int revo_init(struct snd_ice1712 *ice)
Signature · 1 line
1.8.1.2