Skip to content

L
linux-davinci-2.6.23
Commit b6d398c9 authored by Antoine Cellerier's avatar Antoine Cellerier Committed by Ugo Riboni
Browse files
Options

Fix forwarding of return error codes from tvp5146 to davinci_vpfe v4l2 driver.

parent 162283b9
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
drivers/media/video/davinci_vpfe.c
View file @ b6d398c9
...@@ -500,7 +500,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file, ...@@ -500,7 +500,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file,
mode = TVP5146_MODE_SECAM; mode = TVP5146_MODE_SECAM;
} }
vpfe->tvp5146_params.mode = mode | (sqp << 3); vpfe->tvp5146_params.mode = mode | (sqp << 3);
tvp5146_ctrl(TVP5146_CONFIG, &vpfe->tvp5146_params); ret = tvp5146_ctrl(TVP5146_CONFIG, &vpfe->tvp5146_params);
up(&vpfe->lock); up(&vpfe->lock);
break; break;
...@@ -586,7 +586,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file, ...@@ -586,7 +586,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file,
ret = -EINVAL; ret = -EINVAL;
} }
vpfe->tvp5146_params.amuxmode = *index; vpfe->tvp5146_params.amuxmode = *index;
tvp5146_ctrl(TVP5146_SET_AMUXMODE, index); ret = tvp5146_ctrl(TVP5146_SET_AMUXMODE, index);
break; break;
} }
case VIDIOC_CROPCAP: case VIDIOC_CROPCAP:
...@@ -627,17 +627,17 @@ static int vpfe_doioctl(struct inode *inode, struct file *file, ...@@ -627,17 +627,17 @@ static int vpfe_doioctl(struct inode *inode, struct file *file,
} }
case VIDIOC_G_CTRL: case VIDIOC_G_CTRL:
down_interruptible(&vpfe->lock); down_interruptible(&vpfe->lock);
tvp5146_ctrl(VIDIOC_G_CTRL, arg); ret = tvp5146_ctrl(VIDIOC_G_CTRL, arg);
up(&vpfe->lock); up(&vpfe->lock);
break; break;
case VIDIOC_S_CTRL: case VIDIOC_S_CTRL:
down_interruptible(&vpfe->lock); down_interruptible(&vpfe->lock);
tvp5146_ctrl(VIDIOC_S_CTRL, arg); ret = tvp5146_ctrl(VIDIOC_S_CTRL, arg);
up(&vpfe->lock); up(&vpfe->lock);
break; break;
case VIDIOC_QUERYCTRL: case VIDIOC_QUERYCTRL:
down_interruptible(&vpfe->lock); down_interruptible(&vpfe->lock);
tvp5146_ctrl(VIDIOC_QUERYCTRL, arg); ret = tvp5146_ctrl(VIDIOC_QUERYCTRL, arg);
up(&vpfe->lock); up(&vpfe->lock);
break; break;
case VIDIOC_G_CROP: case VIDIOC_G_CROP:
...@@ -761,7 +761,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file, ...@@ -761,7 +761,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file,
vpfe->curFrm->state = STATE_ACTIVE; vpfe->curFrm->state = STATE_ACTIVE;
/* sense the current video input standard */ /* sense the current video input standard */
tvp5146_ctrl(TVP5146_CONFIG, &vpfe->tvp5146_params); ret = tvp5146_ctrl(TVP5146_CONFIG, &vpfe->tvp5146_params);
/* configure the ccdc and resizer as needed */ /* configure the ccdc and resizer as needed */
/* start capture by enabling CCDC and resizer */ /* start capture by enabling CCDC and resizer */
ccdc_config_ycbcr(&vpfe->ccdc_params); ccdc_config_ycbcr(&vpfe->ccdc_params);
...@@ -882,7 +882,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file, ...@@ -882,7 +882,7 @@ static int vpfe_doioctl(struct inode *inode, struct file *file,
vpfe->pixelaspect = sp_aspect; vpfe->pixelaspect = sp_aspect;
} }
vpfe->std = std; vpfe->std = std;
tvp5146_ctrl(TVP5146_CONFIG, params); ret = tvp5146_ctrl(TVP5146_CONFIG, params);
vpfe->tvp5146_params = *params; vpfe->tvp5146_params = *params;
up(&vpfe->lock); up(&vpfe->lock);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment