evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: usb - Remove trailing spaces from USB card name strings

Browse source 
Some USB devices give trailing spaces in strings returned from
usb_string().  This confuses the automatic card-id creation, resulting
always in "default".
This patch fixes the behavior by removing trailing spaces.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-03-21 12:00:00 +01:00
parent 977a6ef3c0
commit 3ffc1222bd
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/usb/card.c
View file

@ -41,6 +41,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/ctype.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/mutex.h> #include <linux/mutex.h>
@ -283,6 +284,15 @@ static int snd_usb_audio_dev_free(struct snd_device *device)
return snd_usb_audio_free(chip); return snd_usb_audio_free(chip);
} }
static void remove_trailing_spaces(char *str)
{
char *p;
if (!*str)
return;
for (p = str + strlen(str) - 1; p >= str && isspace(*p); p--)
*p = 0;
}
/* /*
* create a chip instance and set its names. * create a chip instance and set its names.
@ -351,7 +361,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
snd_component_add(card, component); snd_component_add(card, component);
/* retrieve the device string as shortname */ /* retrieve the device string as shortname */
if (quirk && quirk->product_name) { if (quirk && quirk->product_name && *quirk->product_name) {
strlcpy(card->shortname, quirk->product_name, sizeof(card->shortname)); strlcpy(card->shortname, quirk->product_name, sizeof(card->shortname));
} else { } else {
if (!dev->descriptor.iProduct || if (!dev->descriptor.iProduct ||
@ -363,9 +373,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
USB_ID_PRODUCT(chip->usb_id)); USB_ID_PRODUCT(chip->usb_id));
} }
} }
remove_trailing_spaces(card->shortname);
/* retrieve the vendor and device strings as longname */ /* retrieve the vendor and device strings as longname */
if (quirk && quirk->vendor_name) { if (quirk && quirk->vendor_name && *quirk->vendor_name) {
len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname)); len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname));
} else { } else {
if (dev->descriptor.iManufacturer) if (dev->descriptor.iManufacturer)
@ -375,8 +386,11 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
len = 0; len = 0;
/* we don't really care if there isn't any vendor string */ /* we don't really care if there isn't any vendor string */
} }
if (len > 0) if (len > 0) {
strlcat(card->longname, " ", sizeof(card->longname)); remove_trailing_spaces(card->longname);
if (*card->longname)
strlcat(card->longname, " ", sizeof(card->longname));
}
strlcat(card->longname, card->shortname, sizeof(card->longname)); strlcat(card->longname, card->shortname, sizeof(card->longname));