Loading sound/usb/card.c +2 −12 Original line number Original line Diff line number Diff line Loading @@ -321,16 +321,6 @@ 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. */ */ Loading Loading @@ -414,7 +404,7 @@ static int snd_usb_audio_create(struct usb_interface *intf, USB_ID_PRODUCT(chip->usb_id)); USB_ID_PRODUCT(chip->usb_id)); } } } } remove_trailing_spaces(card->shortname); strim(card->shortname); /* retrieve the vendor and device strings as longname */ /* retrieve the vendor and device strings as longname */ if (quirk && quirk->vendor_name && *quirk->vendor_name) { if (quirk && quirk->vendor_name && *quirk->vendor_name) { Loading @@ -428,7 +418,7 @@ static int snd_usb_audio_create(struct usb_interface *intf, /* 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) { remove_trailing_spaces(card->longname); strim(card->longname); if (*card->longname) if (*card->longname) strlcat(card->longname, " ", sizeof(card->longname)); strlcat(card->longname, " ", sizeof(card->longname)); } } Loading Loading
sound/usb/card.c +2 −12 Original line number Original line Diff line number Diff line Loading @@ -321,16 +321,6 @@ 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. */ */ Loading Loading @@ -414,7 +404,7 @@ static int snd_usb_audio_create(struct usb_interface *intf, USB_ID_PRODUCT(chip->usb_id)); USB_ID_PRODUCT(chip->usb_id)); } } } } remove_trailing_spaces(card->shortname); strim(card->shortname); /* retrieve the vendor and device strings as longname */ /* retrieve the vendor and device strings as longname */ if (quirk && quirk->vendor_name && *quirk->vendor_name) { if (quirk && quirk->vendor_name && *quirk->vendor_name) { Loading @@ -428,7 +418,7 @@ static int snd_usb_audio_create(struct usb_interface *intf, /* 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) { remove_trailing_spaces(card->longname); strim(card->longname); if (*card->longname) if (*card->longname) strlcat(card->longname, " ", sizeof(card->longname)); strlcat(card->longname, " ", sizeof(card->longname)); } } Loading