summaryrefslogtreecommitdiffstats
path: root/sound/pci/trident
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-26 14:58:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-08 13:05:06 +0100
commitb2b93631769364c4e40e8655d7e30915fddf69d3 (patch)
tree727976c238c824ecff94c9e2edd895174b4775b0 /sound/pci/trident
parent5f41f8cacf643281dbb9027b06d4de37e5605f99 (diff)
downloadlinux-stable-b2b93631769364c4e40e8655d7e30915fddf69d3.tar.gz
linux-stable-b2b93631769364c4e40e8655d7e30915fddf69d3.tar.bz2
linux-stable-b2b93631769364c4e40e8655d7e30915fddf69d3.zip
ALSA: trident: Suppress gcc string warning
commit d6b340d7cb33c816ef4abe8143764ec5ab14a5cc upstream. The meddlesome gcc warns about the possible shortname string in trident driver code: sound/pci/trident/trident.c: In function ‘snd_trident_probe’: sound/pci/trident/trident.c:126:2: warning: ‘strcat’ accessing 17 or more bytes at offsets 36 and 20 may overlap 1 byte at offset 36 [-Wrestrict] strcat(card->shortname, card->driver); It happens since gcc calculates the possible string size from card->driver, but this can't be true since we did set the string just before that, and they are much shorter. For shutting it up, use the exactly same string set to card->driver for strcat() to card->shortname, too. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci/trident')
-rw-r--r--sound/pci/trident/trident.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index cedf13b64803..2f18b1cdc2cd 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -123,7 +123,7 @@ static int snd_trident_probe(struct pci_dev *pci,
} else {
strcpy(card->shortname, "Trident ");
}
- strcat(card->shortname, card->driver);
+ strcat(card->shortname, str);
sprintf(card->longname, "%s PCI Audio at 0x%lx, irq %d",
card->shortname, trident->port, trident->irq);