diff --git a/[refs] b/[refs]
index e691d3536a23..83c044c81ecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6f8c0269644a19ee5e9bd6db080b364ab28ea7
+refs/heads/master: 14b702dd71d38b6d0662251b3f8cd60da98602ce
diff --git a/trunk/drivers/media/video/s5k6aa.c b/trunk/drivers/media/video/s5k6aa.c
index 0df7f2a41814..68df8d5befe2 100644
--- a/trunk/drivers/media/video/s5k6aa.c
+++ b/trunk/drivers/media/video/s5k6aa.c
@@ -1582,8 +1582,8 @@ static int s5k6aa_probe(struct i2c_client *client,
 	s5k6aa->inv_vflip = pdata->vert_flip;
 
 	sd = &s5k6aa->sd;
-	strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name));
 	v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops);
+	strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name));
 
 	sd->internal_ops = &s5k6aa_subdev_internal_ops;
 	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;