Merge tag 'tags/isa-void-remove-callback' into for-next

[linux-2.6-microblaze.git] / sound / isa / es1688 / es1688.c

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index d99bb3f..4a1f61f 100644 (file)
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -133,8 +133,8 @@ static int snd_es1688_probe(struct snd_card *card, unsigned int n)
        if (error < 0)
                return error;
 
-       strlcpy(card->driver, "ES1688", sizeof(card->driver));
-       strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
+       strscpy(card->driver, "ES1688", sizeof(card->driver));
+       strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
        snprintf(card->longname, sizeof(card->longname),
                "%s at 0x%lx, irq %i, dma %i", chip->pcm->name, chip->port,
                 chip->irq, chip->dma8);