diff --git a/[refs] b/[refs]
index b9b392643d73..2f978b1a8ee4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e276f7b5f9c41536f22bec1d8205e6b201300743
+refs/heads/master: 098003d8e21c490c104b543918dea12b7608a173
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 0d24e2297457..210c68aaae00 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -273,8 +273,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
 	u8 eedata[256];
 
 	memset(&c, 0, sizeof(c));
-	strncpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
-	c.name[sizeof(c.name)-1] = '\0';
+	strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
 	c.adapter = &cx->i2c_adap[0];
 	c.addr = 0xA0 >> 1;