aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-09-18 03:22:32 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:01:29 -0200
commit393bf5573269979aa3fb55d1bdd0db4fcb288f99 (patch)
treec514bb358342276c57adaa9586e51738630a8df4
parenta2e521e85c04af3511af3ea8971efb4ef8bde533 (diff)
V4L/DVB (6467): v4l2-common: minor cleanups
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/v4l2-common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 61ebdb0afa1..c056ff6d810 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/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;