---

yaml --- r: 234053 b: refs/heads/master c: 1e6406b h: refs/heads/master i: 234051: 4073477 v: v3
git-mirror · Mar 2, 2011 · 12de9a0 · 12de9a0
1 parent 7396965
commit 12de9a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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) {