From ccfd4cac0775359f89697d37f32e2c9a49cbe984 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 4 Oct 2011 09:29:39 +0300
Subject: [PATCH] --- yaml --- r: 270442 b: refs/heads/master c:
 f92766bc8948f978a838a5607bea95804c8dfdfe h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/sound/core/oss/mixer_oss.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98a938d09a0c..ea2ac4ac7266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0978e8039f1b1bfb9fbc68f682b14313bb4f9ad
+refs/heads/master: f92766bc8948f978a838a5607bea95804c8dfdfe
diff --git a/trunk/sound/core/oss/mixer_oss.c b/trunk/sound/core/oss/mixer_oss.c
index d8359cfeca15..1b5e0c49a0ad 100644
--- a/trunk/sound/core/oss/mixer_oss.c
+++ b/trunk/sound/core/oss/mixer_oss.c
@@ -499,7 +499,7 @@ static struct snd_kcontrol *snd_mixer_oss_test_id(struct snd_mixer_oss *mixer, c
 	
 	memset(&id, 0, sizeof(id));
 	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-	strcpy(id.name, name);
+	strlcpy(id.name, name, sizeof(id.name));
 	id.index = index;
 	return snd_ctl_find_id(card, &id);
 }