diff options
Diffstat (limited to 'sound/parisc')
| -rw-r--r-- | sound/parisc/Makefile | 2 | ||||
| -rw-r--r-- | sound/parisc/harmony.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/parisc/Makefile b/sound/parisc/Makefile index 10891c3b7d91..84c71490fb72 100644 --- a/sound/parisc/Makefile +++ b/sound/parisc/Makefile @@ -3,7 +3,7 @@ # Makefile for ALSA # -snd-harmony-objs := harmony.o +snd-harmony-y := harmony.o # Toplevel Module Dependency obj-$(CONFIG_SND_HARMONY) += snd-harmony.o diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index db9c296dd688..76dd2210f9ea 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -601,7 +601,7 @@ snd_harmony_pcm_init(struct snd_harmony *h) pcm->private_data = h; pcm->info_flags = 0; - strcpy(pcm->name, "harmony"); + strscpy(pcm->name, "harmony"); h->pcm = pcm; h->psubs = NULL; @@ -823,7 +823,7 @@ snd_harmony_mixer_init(struct snd_harmony *h) if (snd_BUG_ON(!h)) return -EINVAL; card = h->card; - strcpy(card->mixername, "Harmony Gain control interface"); + strscpy(card->mixername, "Harmony Gain control interface"); for (idx = 0; idx < HARMONY_CONTROLS; idx++) { err = snd_ctl_add(card, @@ -937,8 +937,8 @@ snd_harmony_probe(struct parisc_device *padev) if (err < 0) goto free_and_ret; - strcpy(card->driver, "harmony"); - strcpy(card->shortname, "Harmony"); + strscpy(card->driver, "harmony"); + strscpy(card->shortname, "Harmony"); sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, h->hpa, h->irq); |