diff --git a/[refs] b/[refs]
index a637e79f0736..3ad672c5c657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04e1ac04e54e420908c9ac3e09025f8266dcdf57
+refs/heads/master: 1c3fc152b8ebadd59814767e3189c961b73f20c8
diff --git a/trunk/drivers/staging/media/go7007/snd-go7007.c b/trunk/drivers/staging/media/go7007/snd-go7007.c
index 5af29ff68bfd..6f6271ec558c 100644
--- a/trunk/drivers/staging/media/go7007/snd-go7007.c
+++ b/trunk/drivers/staging/media/go7007/snd-go7007.c
@@ -267,9 +267,9 @@ int go7007_snd_init(struct go7007 *go)
 		kfree(gosnd);
 		return ret;
 	}
-	strncpy(gosnd->card->driver, "go7007", sizeof(gosnd->card->driver));
-	strncpy(gosnd->card->shortname, go->name, sizeof(gosnd->card->driver));
-	strncpy(gosnd->card->longname, gosnd->card->shortname,
+	strlcpy(gosnd->card->driver, "go7007", sizeof(gosnd->card->driver));
+	strlcpy(gosnd->card->shortname, go->name, sizeof(gosnd->card->driver));
+	strlcpy(gosnd->card->longname, gosnd->card->shortname,
 			sizeof(gosnd->card->longname));
 
 	gosnd->pcm->private_data = go;