aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-25 08:00:15 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 15:20:07 -0300
commit4ca286610f664acf3153634f3930acd2de993a9f (patch)
tree0a2288e4c51b97fa51da09c5ad727385970f2f2c /drivers/media/radio
parent8b21eb17e749c9693eaea065f0eb95365006495c (diff)
downloadlinux-linaro-stable-4ca286610f664acf3153634f3930acd2de993a9f.tar.gz
[media] radio-rtrack2: fix mute bug
Setting the frequency would unmute the card. Fixed the mute handling in the s_frequency code. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/radio-rtrack2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index b1f844c64fde..09cfbc373c92 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -8,6 +8,8 @@
*
* Converted to the radio-isa framework by Hans Verkuil <hans.verkuil@cisco.com>
* Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
+ *
+ * Fully tested with actual hardware and the v4l2-compliance tool.
*/
#include <linux/module.h> /* Modules */
@@ -81,8 +83,7 @@ static int rtrack2_s_frequency(struct radio_isa_card *isa, u32 freq)
zero(isa);
outb_p(0xc8, isa->io);
- if (!v4l2_ctrl_g_ctrl(isa->mute))
- outb_p(0, isa->io);
+ outb_p(v4l2_ctrl_g_ctrl(isa->mute), isa->io);
return 0;
}