mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ALSA: opti9x: Fix -Wformat-truncation warning 

The filling of card->longname can be gracefully truncated, as it's
only informative.  Use scnprintf() and suppress the superfluous
compile warning with -Wformat-truncation.

Link: https://lore.kernel.org/r/20230915082802.28684-9-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-09-15 10:27:57 +02:00
parent 1e97acf3a6
commit bc44e10abb
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/isa/opti9xx/miro.c
View File

@ -1344,10 +1344,10 @@ static int snd_miro_probe(struct snd_card *card)
}
strcpy(card->driver, "miro");
snprintf(card->longname, sizeof(card->longname),
"%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, miro->name, codec->pcm->name,
miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2);
scnprintf(card->longname, sizeof(card->longname),
"%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, miro->name, codec->pcm->name,
miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2);
if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)
rmidi = NULL;

16
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -859,15 +859,15 @@ static int snd_opti9xx_probe(struct snd_card *card)
strcpy(card->driver, chip->name);
sprintf(card->shortname, "OPTi %s", card->driver);
#if defined(CS4231) || defined(OPTi93X)
snprintf(card->longname, sizeof(card->longname),
"%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, codec->pcm->name,
chip->wss_base + 4, irq, dma1, xdma2);
scnprintf(card->longname, sizeof(card->longname),
"%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, codec->pcm->name,
chip->wss_base + 4, irq, dma1, xdma2);
#else
snprintf(card->longname, sizeof(card->longname),
"%s, %s at 0x%lx, irq %d, dma %d",
card->shortname, codec->pcm->name, chip->wss_base + 4, irq,
dma1);
scnprintf(card->longname, sizeof(card->longname),
"%s, %s at 0x%lx, irq %d, dma %d",
card->shortname, codec->pcm->name, chip->wss_base + 4, irq,
dma1);
#endif /* CS4231 || OPTi93X */
if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)