From 467750dc97e197d320a7571611aa35e572a67fae Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 8 May 2007 00:25:42 -0700
Subject: [PATCH] --- yaml --- r: 54576 b: refs/heads/master c:
 880afc4d76af452267174b5989943f081c1db2c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e38146a2d661..85a400e13ec5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6192bd536f96c6a0d969081bc71ae24f9319bfdc
+refs/heads/master: 880afc4d76af452267174b5989943f081c1db2c0
diff --git a/trunk/sound/oss/btaudio.c b/trunk/sound/oss/btaudio.c
index f813ae9c2134..4d5cf05b8922 100644
--- a/trunk/sound/oss/btaudio.c
+++ b/trunk/sound/oss/btaudio.c
@@ -344,7 +344,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
 	if (cmd == SOUND_OLD_MIXER_INFO) {
 		_old_mixer_info info;
 		memset(&info,0,sizeof(info));
-                strlcpy(info.id,"bt878",sizeof(info.id)-1);
+                strlcpy(info.id, "bt878", sizeof(info.id));
                 strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;