2 files changed, 6 insertions, 4 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 37d0220a094c..db7a2e5e4a14 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -183,8 +183,10 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,
         }
 #endif
  
-        strcpy(card->driver, emu->card_capabilities->driver);
-        strcpy(card->shortname, emu->card_capabilities->name);
+        strlcpy(card->driver, emu->card_capabilities->driver,
+                sizeof(card->driver));
+        strlcpy(card->shortname, emu->card_capabilities->name,
+                sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
                  "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
                  card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 54079f5d5673..4f8cf5e7e45f 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1446,7 +1446,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          *
          */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",
+         .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
@@ -1596,7 +1596,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
-         .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",
+         .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,