diff --git a/[refs] b/[refs]
index b93e8550fb7b..af24d2523571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05985715756b8667cb35a3e05e1668bb8afe3298
+refs/heads/master: 86b5ac878d4a63c772d03c5017b72cc799a8f2f2
diff --git a/trunk/drivers/i2c/chips/via686a.c b/trunk/drivers/i2c/chips/via686a.c
index 9b948f4531f5..ecd1e1de3f05 100644
--- a/trunk/drivers/i2c/chips/via686a.c
+++ b/trunk/drivers/i2c/chips/via686a.c
@@ -651,10 +651,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 	new_client->adapter = adapter;
 	new_client->driver = &via686a_driver;
 	new_client->flags = 0;
-	new_client->dev.parent = &adapter->dev;
 
 	/* Fill in the remaining client fields and put into the global list */
-	snprintf(new_client->name, I2C_NAME_SIZE, client_name);
+	strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
 
 	data->valid = 0;
 	init_MUTEX(&data->update_lock);