asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB (12415): radio-si470x: add disconnect check function

Browse source 
The si470x_disconnect_check is function to check disconnect state of
radio in common file. The function is implemented in each interface
file.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Joonyoung Shim 2009-08-09 14:23:02 -03:00 committed by Mauro Carvalho Chehab
parent a9d6fd5e31
commit 3c7cc8d52c
3 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/media/radio/si470x/radio-si470x-common.c
View file

@ -475,10 +475,9 @@ static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
switch (ctrl->id) {
case V4L2_CID_AUDIO_VOLUME:
@ -511,10 +510,9 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
switch (ctrl->id) {
case V4L2_CID_AUDIO_VOLUME:
@ -567,10 +565,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
if (tuner->index != 0) {
retval = -EINVAL;
goto done;
@ -649,10 +647,10 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
int retval = -EINVAL;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
if (tuner->index != 0)
goto done;
@ -688,10 +686,10 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
if (freq->tuner != 0) {
retval = -EINVAL;
goto done;
@ -718,10 +716,10 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
if (freq->tuner != 0) {
retval = -EINVAL;
goto done;
@ -747,10 +745,10 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
int retval = 0;
/* safety checks */
if (radio->disconnected) {
retval = -EIO;
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
}
if (seek->tuner != 0) {
retval = -EINVAL;
goto done;

17
drivers/media/radio/si470x/radio-si470x-usb.c
View file

@ -370,6 +370,23 @@ static int si470x_get_scratch_page_versions(struct si470x_device *radio)
/**************************************************************************
* General Driver Functions - DISCONNECT_CHECK
**************************************************************************/
/*
* si470x_disconnect_check - check whether radio disconnects
*/
int si470x_disconnect_check(struct si470x_device *radio)
{
if (radio->disconnected)
return -EIO;
else
return 0;
}
/**************************************************************************
* RDS Driver Functions
**************************************************************************/

1
drivers/media/radio/si470x/radio-si470x.h
View file

@ -193,6 +193,7 @@ extern const struct v4l2_file_operations si470x_fops;
extern struct video_device si470x_viddev_template;
int si470x_get_register(struct si470x_device *radio, int regnr);
int si470x_set_register(struct si470x_device *radio, int regnr);
int si470x_disconnect_check(struct si470x_device *radio);
int si470x_set_freq(struct si470x_device *radio, unsigned int freq);
int si470x_start(struct si470x_device *radio);
int si470x_stop(struct si470x_device *radio);