diff mbox

[V2,2/2] ALSA: usb-audio: Add check return value for usb_string()

Message ID 1512369109-23253-3-git-send-email-climbbb.kim@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jaejoong Kim Dec. 4, 2017, 6:31 a.m. UTC 
snd_usb_copy_string_desc() returns zero if usb_string() fails.
In case of failure, we need to check the snd_usb_copy_string_desc()'s
return value and add an exception case

Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
---

Changes in V2:
 - change return value check.

 sound/usb/mixer.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Takashi Iwai Dec. 4, 2017, 8:18 a.m. UTC | #1 
On Mon, 04 Dec 2017 07:31:49 +0100,
Jaejoong Kim wrote:
> 
> snd_usb_copy_string_desc() returns zero if usb_string() fails.
> In case of failure, we need to check the snd_usb_copy_string_desc()'s
> return value and add an exception case
> 
> Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>

Applied, thanks.


Takashi
diff mbox

Patch

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 3294e3a..84b9f9c 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2165,13 +2165,14 @@  static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
 	if (len)
 		;
 	else if (nameid)
-		snd_usb_copy_string_desc(state, nameid, kctl->id.name,
+		len = snd_usb_copy_string_desc(state, nameid, kctl->id.name,
 					 sizeof(kctl->id.name));
-	else {
+	else
 		len = get_term_name(state, &state->oterm,
 				    kctl->id.name, sizeof(kctl->id.name), 0);
-		if (!len)
-			strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
+
+	if (!len) {
+		strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
 
 		if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
 			append_ctl_name(kctl, " Clock Source");