Hi,

Looks good, ack.

Acked-by: Hans de Goede <hdego...@redhat.com>

Regards,

Hans


On 05/10/2012 09:05 AM, Hans Verkuil wrote:
From: Hans Verkuil<hans.verk...@cisco.com>

The tea575x-tuner framework can support the VIDIOC_S_HW_FREQ_SEEK for only
some of the tea575x-based boards. Mark this ioctl as invalid if the board
doesn't support it.

This fixes an issue with S_HW_FREQ_SEEK in combination with priority handling:
since the priority check is done first it could return -EBUSY, even though
calling the S_HW_FREQ_SEEK ioctl would return -ENOTTY. It should always return
ENOTTY in such a case.

Signed-off-by: Hans Verkuil<hans.verk...@cisco.com>
---
  sound/i2c/other/tea575x-tuner.c |    3 +++
  1 file changed, 3 insertions(+)

diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index a63faec..6e9ca7b 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -375,6 +375,9 @@ int snd_tea575x_init(struct snd_tea575x *tea)
        tea->vd.v4l2_dev = tea->v4l2_dev;
        tea->vd.ctrl_handler =&tea->ctrl_handler;
        set_bit(V4L2_FL_USE_FH_PRIO,&tea->vd.flags);
+       /* disable hw_freq_seek if we can't use it */
+       if (tea->cannot_read_data)
+               v4l2_dont_use_cmd(&tea->vd, VIDIOC_S_HW_FREQ_SEEK);

        v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
        v4l2_ctrl_new_std(&tea->ctrl_handler,&tea575x_ctrl_ops, 
V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to