redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] tlg2300: fix frequency handling

Browse source 
The usual set of problems: the frequency isn't clamped to the frequency range,
no tuner index check and the frequency isn't initialized properly on module
load.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-01-31 06:27:37 -03:00 committed by Mauro Carvalho Chehab
parent c5d8907faa
commit 7556ba9bfb
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/usb/tlg2300/pd-common.h
View file

@ -36,8 +36,8 @@
#define V4L_PAL_VBI_FRAMESIZE (V4L_PAL_VBI_LINES * 1440 * 2) #define V4L_PAL_VBI_FRAMESIZE (V4L_PAL_VBI_LINES * 1440 * 2)
#define V4L_NTSC_VBI_FRAMESIZE (V4L_NTSC_VBI_LINES * 1440 * 2) #define V4L_NTSC_VBI_FRAMESIZE (V4L_NTSC_VBI_LINES * 1440 * 2)
#define TUNER_FREQ_MIN (45000000) #define TUNER_FREQ_MIN (45000000U)
#define TUNER_FREQ_MAX (862000000) #define TUNER_FREQ_MAX (862000000U)
struct vbi_data { struct vbi_data {
struct video_device v_dev; struct video_device v_dev;

20
drivers/media/usb/tlg2300/pd-video.c
View file

@ -940,7 +940,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int i)
return 0; return 0;
} }
static struct poseidon_control *check_control_id(__u32 id) static struct poseidon_control *check_control_id(u32 id)
{ {
struct poseidon_control *control = &controls[0]; struct poseidon_control *control = &controls[0];
int array_size = ARRAY_SIZE(controls); int array_size = ARRAY_SIZE(controls);
@ -1134,21 +1134,21 @@ static int vidioc_g_frequency(struct file *file, void *fh,
return 0; return 0;
} }
static int set_frequency(struct poseidon *pd, __u32 frequency) static int set_frequency(struct poseidon *pd, u32 *frequency)
{ {
s32 ret = 0, param, cmd_status; s32 ret = 0, param, cmd_status;
struct running_context *context = &pd->video_data.context; struct running_context *context = &pd->video_data.context;
param = frequency * 62500 / 1000; *frequency = clamp(*frequency,
if (param < TUNER_FREQ_MIN/1000 || param > TUNER_FREQ_MAX / 1000) TUNER_FREQ_MIN / 62500, TUNER_FREQ_MAX / 62500);
return -EINVAL; param = (*frequency) * 62500 / 1000;
mutex_lock(&pd->lock); mutex_lock(&pd->lock);
ret = send_set_req(pd, TUNE_FREQ_SELECT, param, &cmd_status); ret = send_set_req(pd, TUNE_FREQ_SELECT, param, &cmd_status);
ret = send_set_req(pd, TAKE_REQUEST, 0, &cmd_status); ret = send_set_req(pd, TAKE_REQUEST, 0, &cmd_status);
msleep(250); /* wait for a while until the hardware is ready. */ msleep(250); /* wait for a while until the hardware is ready. */
context->freq = frequency; context->freq = *frequency;
mutex_unlock(&pd->lock); mutex_unlock(&pd->lock);
return ret; return ret;
} }
@ -1159,12 +1159,14 @@ static int vidioc_s_frequency(struct file *file, void *fh,
struct front_face *front = fh; struct front_face *front = fh;
struct poseidon *pd = front->pd; struct poseidon *pd = front->pd;
if (freq->tuner)
return -EINVAL;
logs(front); logs(front);
#ifdef CONFIG_PM #ifdef CONFIG_PM
pd->pm_suspend = pm_video_suspend; pd->pm_suspend = pm_video_suspend;
pd->pm_resume = pm_video_resume; pd->pm_resume = pm_video_resume;
#endif #endif
return set_frequency(pd, freq->frequency); return set_frequency(pd, &freq->frequency);
} }
static int vidioc_reqbufs(struct file *file, void *fh, static int vidioc_reqbufs(struct file *file, void *fh,
@ -1351,7 +1353,7 @@ static int restore_v4l2_context(struct poseidon *pd,
vidioc_s_input(NULL, front, context->sig_index); vidioc_s_input(NULL, front, context->sig_index);
pd_vidioc_s_tuner(pd, context->audio_idx); pd_vidioc_s_tuner(pd, context->audio_idx);
pd_vidioc_s_fmt(pd, &context->pix); pd_vidioc_s_fmt(pd, &context->pix);
set_frequency(pd, context->freq); set_frequency(pd, &context->freq);
return 0; return 0;
} }
@ -1615,8 +1617,10 @@ int pd_video_init(struct poseidon *pd)
{ {
struct video_data *video = &pd->video_data; struct video_data *video = &pd->video_data;
struct vbi_data *vbi = &pd->vbi_data; struct vbi_data *vbi = &pd->vbi_data;
u32 freq = TUNER_FREQ_MIN / 62500;
int ret = -ENOMEM; int ret = -ENOMEM;
set_frequency(pd, &freq);
video->v_dev = pd_video_template; video->v_dev = pd_video_template;
video->v_dev.v4l2_dev = &pd->v4l2_dev; video->v_dev.v4l2_dev = &pd->v4l2_dev;
video_set_drvdata(&video->v_dev, pd); video_set_drvdata(&video->v_dev, pd);