Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / sound / pci / hda / hda_codec.c

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index eec1775..9b75506 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3999,7 +3999,7 @@ int snd_hda_add_imux_item(struct hda_codec *codec,
                         sizeof(imux->items[imux->num_items].label),
                         "%s %d", label, label_idx);
        else
-               strlcpy(imux->items[imux->num_items].label, label,
+               strscpy(imux->items[imux->num_items].label, label,
                        sizeof(imux->items[imux->num_items].label));
        imux->items[imux->num_items].index = index;
        imux->num_items++;