diff --git a/[refs] b/[refs]
index 5e0ad555da1a..6d8bbc93156e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f31c91e12c504b86ce67b2f92d11a19d1e262a
+refs/heads/master: 136d9f3a41bc528773430f2723cf27963bbd6fbc
diff --git a/trunk/drivers/staging/media/go7007/saa7134-go7007.c b/trunk/drivers/staging/media/go7007/saa7134-go7007.c
index d35d5c2ea1c3..d80b235d72ee 100644
--- a/trunk/drivers/staging/media/go7007/saa7134-go7007.c
+++ b/trunk/drivers/staging/media/go7007/saa7134-go7007.c
@@ -466,7 +466,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
 
 	go->board_id = GO7007_BOARDID_PCI_VOYAGER;
 	snprintf(go->bus_info, sizeof(go->bus_info), "PCI:%s", pci_name(dev->pci));
-	strncpy(go->name, saa7134_boards[dev->board].name, sizeof(go->name));
+	strlcpy(go->name, saa7134_boards[dev->board].name, sizeof(go->name));
 	go->hpi_ops = &saa7134_go7007_hpi_ops;
 	go->hpi_context = saa;
 	saa->dev = dev;