Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx18 / cx18-driver.c

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 0d24e229745781ee0c74d70b98a02e863a44d4d4..210c68aaae00ede73af85a4804b156e246a8fe6c 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/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;