From a53f66c46dd1249358c6a57de16b0270c370e365 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Tue, 13 Dec 2011 11:06:12 -0300
Subject: [PATCH] --- yaml --- r: 294975 b: refs/heads/master c:
 14b702dd71d38b6d0662251b3f8cd60da98602ce h: refs/heads/master i:   294973:
 f554962e2e1cd770ce9f3be859db5b0780b908d0   294971:
 74cd6b0fffb190b8fe1452becd64479b0e493c17   294967:
 481e29abef76bd5302f64296da6f588341ecd877   294959:
 54407c19e4084484e7c806f7cb008da000ca1891   294943:
 b4a0d0adc4db6994ddb04256f1b92edb7d0c9d9c   294911:
 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/s5k6aa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;