|
@@ -1165,7 +1165,7 @@ int pcxhr_create_pcm(struct snd_pcxhr *chip)
|
|
|
struct snd_pcm *pcm;
|
|
|
char name[32];
|
|
|
|
|
|
- sprintf(name, "pcxhr %d", chip->chip_idx);
|
|
|
+ snprintf(name, sizeof(name), "pcxhr %d", chip->chip_idx);
|
|
|
if ((err = snd_pcm_new(chip->card, name, 0,
|
|
|
chip->nb_streams_play,
|
|
|
chip->nb_streams_capt, &pcm)) < 0) {
|
|
@@ -1252,7 +1252,7 @@ static void pcxhr_proc_info(struct snd_info_entry *entry,
|
|
|
struct snd_pcxhr *chip = entry->private_data;
|
|
|
struct pcxhr_mgr *mgr = chip->mgr;
|
|
|
|
|
|
- snd_iprintf(buffer, "\n%s\n", mgr->longname);
|
|
|
+ snd_iprintf(buffer, "\n%s\n", mgr->name);
|
|
|
|
|
|
/* stats available when embedded DSP is running */
|
|
|
if (mgr->dsp_loaded & (1 << PCXHR_FIRMWARE_DSP_MAIN_INDEX)) {
|
|
@@ -1339,7 +1339,7 @@ static void pcxhr_proc_sync(struct snd_info_entry *entry,
|
|
|
max_clock = PCXHR_CLOCK_TYPE_MAX;
|
|
|
}
|
|
|
|
|
|
- snd_iprintf(buffer, "\n%s\n", mgr->longname);
|
|
|
+ snd_iprintf(buffer, "\n%s\n", mgr->name);
|
|
|
snd_iprintf(buffer, "Current Sample Clock\t: %s\n",
|
|
|
texts[mgr->cur_clock_type]);
|
|
|
snd_iprintf(buffer, "Current Sample Rate\t= %d\n",
|
|
@@ -1597,10 +1597,9 @@ static int pcxhr_probe(struct pci_dev *pci,
|
|
|
}
|
|
|
mgr->irq = pci->irq;
|
|
|
|
|
|
- sprintf(mgr->shortname, "Digigram %s", card_name);
|
|
|
- sprintf(mgr->longname, "%s at 0x%lx & 0x%lx, 0x%lx irq %i",
|
|
|
- mgr->shortname,
|
|
|
- mgr->port[0], mgr->port[1], mgr->port[2], mgr->irq);
|
|
|
+ snprintf(mgr->name, sizeof(mgr->name),
|
|
|
+ "Digigram at 0x%lx & 0x%lx, 0x%lx irq %i",
|
|
|
+ mgr->port[0], mgr->port[1], mgr->port[2], mgr->irq);
|
|
|
|
|
|
/* ISR lock */
|
|
|
mutex_init(&mgr->lock);
|
|
@@ -1644,8 +1643,10 @@ static int pcxhr_probe(struct pci_dev *pci,
|
|
|
}
|
|
|
|
|
|
strcpy(card->driver, DRIVER_NAME);
|
|
|
- sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i);
|
|
|
- sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i);
|
|
|
+ snprintf(card->shortname, sizeof(card->shortname),
|
|
|
+ "Digigram [PCM #%d]", i);
|
|
|
+ snprintf(card->longname, sizeof(card->longname),
|
|
|
+ "%s [PCM #%d]", mgr->name, i);
|
|
|
|
|
|
if ((err = pcxhr_create(mgr, card, i)) < 0) {
|
|
|
snd_card_free(card);
|