From b182f3fb7cbca7403a8eb88e9f639c8bf232f06f Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sat, 6 Apr 2013 06:06:13 -0300
Subject: [PATCH] --- yaml --- r: 367007 b: refs/heads/master c:
 0f0fe4b9f6f32b90c82345b97da2977b84e14414 h: refs/heads/master i:   367005:
 3b85f034ea2ea07bce917b229a3ee2264819bea8   367003:
 b657c5aabc493627c40a296464c34ae1aa8246d7   366999:
 2cd0b4dc7f3e6c2692180d6b9745c0413d3302d8   366991:
 398878f115cb61336427b2b7dbb5422dec49346c   366975:
 3d45607541bafbaf78262ec49e5fdbca433ae1ee v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 77fef4a74e4c..2c0949d71f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eef25107cab65a1158b11ba373fb9b4fc25b4b8
+refs/heads/master: 0f0fe4b9f6f32b90c82345b97da2977b84e14414
diff --git a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
index 7a96162f544f..c48d0acd8bb9 100644
--- a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1869,16 +1869,16 @@ static int v4l_dbg_g_chip_name(const struct v4l2_ioctl_ops *ops,
 			p->flags |= V4L2_CHIP_FL_WRITABLE;
 		if (ops->vidioc_g_register)
 			p->flags |= V4L2_CHIP_FL_READABLE;
-		if (ops->vidioc_g_chip_name)
-			return ops->vidioc_g_chip_name(file, fh, arg);
-		if (p->match.addr)
-			return -EINVAL;
 		if (vfd->v4l2_dev)
 			strlcpy(p->name, vfd->v4l2_dev->name, sizeof(p->name));
 		else if (vfd->parent)
 			strlcpy(p->name, vfd->parent->driver->name, sizeof(p->name));
 		else
 			strlcpy(p->name, "bridge", sizeof(p->name));
+		if (ops->vidioc_g_chip_name)
+			return ops->vidioc_g_chip_name(file, fh, arg);
+		if (p->match.addr)
+			return -EINVAL;
 		return 0;
 
 	case V4L2_CHIP_MATCH_SUBDEV: