From 8a0e58d425427070f369e7b4d889254a985d3313 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 18 Sep 2007 03:22:32 -0300
Subject: [PATCH] --- yaml --- r: 76338 b: refs/heads/master c:
 393bf5573269979aa3fb55d1bdd0db4fcb288f99 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/v4l2-common.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 680774d02163..34e04f455368 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2e521e85c04af3511af3ea8971efb4ef8bde533
+refs/heads/master: 393bf5573269979aa3fb55d1bdd0db4fcb288f99
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c
index 61ebdb0afa12..c056ff6d810c 100644
--- a/trunk/drivers/media/video/v4l2-common.c
+++ b/trunk/drivers/media/video/v4l2-common.c
@@ -1028,13 +1028,12 @@ int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver
 	client->addr = address;
 	client->adapter = adapter;
 	client->driver = driver;
-	snprintf(client->name, sizeof(client->name) - 1, name);
+	strlcpy(client->name, name, sizeof(client->name));
 
 	err = probe(client);
 	if (err == 0) {
 		i2c_attach_client(client);
-	}
-	else {
+	} else {
 		kfree(client);
 	}
 	return err != -ENOMEM ? 0 : err;