From 3b2a571f66f2abb0f9428525c776362d825a6624 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 19 Jul 2009 09:10:06 -0300
Subject: [PATCH] --- yaml --- r: 161447 b: refs/heads/master c:
 ed10daaeb3512165505eda8bb311edabea5cb485 h: refs/heads/master i:   161445:
 32794f6dc71aeddf215f827d2f651b8553649960   161443:
 f46988dd385e354c95d04ebcaeb3cef5b26e8898   161439:
 9c31fa783cd34bcbfce89f18057f1419ac2e6ec4 v: v3

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

diff --git a/[refs] b/[refs]
index 803efad5f571..18d02481347a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2365b2d307ee0323062c674ea0495584085e8c24
+refs/heads/master: ed10daaeb3512165505eda8bb311edabea5cb485
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index ab079d9256c4..e612e43b0ef1 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -124,7 +124,7 @@ static struct em28xx_fmt format[] = {
 
 /* supported controls */
 /* Common to all boards */
-static struct v4l2_queryctrl em28xx_qctrl[] = {
+static struct v4l2_queryctrl ac97_qctrl[] = {
 	{
 		.id = V4L2_CID_AUDIO_VOLUME,
 		.type = V4L2_CTRL_TYPE_INTEGER,
@@ -1050,9 +1050,9 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 	qc->id = id;
 
 	if (!dev->board.has_msp34xx) {
-		for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-			if (qc->id && qc->id == em28xx_qctrl[i].id) {
-				memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+		for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+			if (qc->id && qc->id == ac97_qctrl[i].id) {
+				memcpy(qc, &(ac97_qctrl[i]), sizeof(*qc));
 				return 0;
 			}
 		}
@@ -1114,10 +1114,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 		v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_ctrl, ctrl);
 	else {
 		rc = 1;
-		for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-			if (ctrl->id == em28xx_qctrl[i].id) {
-				if (ctrl->value < em28xx_qctrl[i].minimum ||
-				    ctrl->value > em28xx_qctrl[i].maximum) {
+		for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+			if (ctrl->id == ac97_qctrl[i].id) {
+				if (ctrl->value < ac97_qctrl[i].minimum ||
+				    ctrl->value > ac97_qctrl[i].maximum) {
 					rc = -ERANGE;
 					break;
 				}
@@ -1654,9 +1654,9 @@ static int radio_queryctrl(struct file *file, void *priv,
 		qc->id >= V4L2_CID_LASTP1)
 		return -EINVAL;
 
-	for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-		if (qc->id && qc->id == em28xx_qctrl[i].id) {
-			memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+	for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+		if (qc->id && qc->id == ac97_qctrl[i].id) {
+			memcpy(qc, &(ac97_qctrl[i]), sizeof(*qc));
 			return 0;
 		}
 	}