public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Sven Barth <pascaldragon@googlemail.com>
To: LMML <linux-media@vger.kernel.org>, Andy Walls <awalls@md.metrocast.net>
Subject: [PATCH] cx25840: fix probing of cx2583x chips
Date: Sat, 05 Feb 2011 22:53:35 +0100	[thread overview]
Message-ID: <4D4DC6DF.7020101@googlemail.com> (raw)

Fix the probing of cx2583x chips, because two controls were clustered 
that are not created for these chips.

This regression was introduced in 2.6.36.

Signed-off-by: Sven Barth <pascaldragon@googlemail.com>

diff -aur linux-2.6.37/drivers/media/video/cx25840/cx25840-core.c 
linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c
--- linux-2.6.37/drivers/media/video/cx25840/cx25840-core.c	2011-01-05 
00:50:19.000000000 +0000
+++ linux-2.6.37-patched/drivers/media/video/cx25840/cx25840-core.c 
2011-02-05 15:58:27.733325238 +0000
@@ -2031,7 +2031,8 @@
  		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);

  	cx25840_ir_probe(sd);

             reply	other threads:[~2011-02-05 21:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-05 21:53 Sven Barth [this message]
2011-02-05 23:45 ` [PATCH] cx25840: fix probing of cx2583x chips Andy Walls

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D4DC6DF.7020101@googlemail.com \
    --to=pascaldragon@googlemail.com \
    --cc=awalls@md.metrocast.net \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox