From 12de9a08ed2ce178b4ee6ee1b1e2bf3e7c0f16a7 Mon Sep 17 00:00:00 2001
From: Sven Barth <pascaldragon@googlemail.com>
Date: Sun, 13 Feb 2011 22:09:43 -0300
Subject: [PATCH] --- yaml --- r: 234053 b: refs/heads/master c:
 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb h: refs/heads/master i:   234051:
 4073477b063b8c2d79196b3b2be5f68c5c9ec945 v: v3

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

diff --git a/[refs] b/[refs]
index e9b11f930803..f99358993dbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 593110d143f85d1aca227685edd571f137388b24
+refs/heads/master: 1e6406b8f0dc1ae7d7c39c9e1ac6ca78e016ebfb
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
index 6fc09dd41b9d..35796e035247 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-core.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -2015,7 +2015,8 @@ static int cx25840_probe(struct i2c_client *client,
 		kfree(state);
 		return err;
 	}
-	v4l2_ctrl_cluster(2, &state->volume);
+	if (!is_cx2583x(state))
+		v4l2_ctrl_cluster(2, &state->volume);
 	v4l2_ctrl_handler_setup(&state->hdl);
 
 	if (client->dev.platform_data) {