leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (10095): The failure of set_fmt is solved in tw9910

Browse Source 
priv->scale is checked in start_capture.
Therefore, it should be NULL if failing in set_fmt.
This patch resolve this problem.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kuninori Morimoto 2008-12-29 06:04:16 -03:00 committed by Mauro Carvalho Chehab
parent ed922a892e
commit 6d75611231
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/video/tw9910.c
View File

@ -651,7 +651,7 @@ static int tw9910_set_fmt(struct soc_camera_device *icd, __u32 pixfmt,
*/
priv->scale = tw9910_select_norm(icd, rect->width, rect->height);
if (!priv->scale)
return ret;
goto tw9910_set_fmt_error;
/*
* reset hardware
@ -659,7 +659,8 @@ static int tw9910_set_fmt(struct soc_camera_device *icd, __u32 pixfmt,
tw9910_reset(priv->client);
ret = tw9910_write_array(priv->client, tw9910_default_regs);
if (ret < 0)
return ret;
goto tw9910_set_fmt_error;
/*
* set bus width
*/
@ -669,7 +670,7 @@ static int tw9910_set_fmt(struct soc_camera_device *icd, __u32 pixfmt,
ret = tw9910_mask_set(priv->client, OPFORM, LEN, val);
if (ret < 0)
return ret;
goto tw9910_set_fmt_error;
/*
* select MPOUT behavior
@ -697,26 +698,35 @@ static int tw9910_set_fmt(struct soc_camera_device *icd, __u32 pixfmt,
ret = tw9910_mask_set(priv->client, VBICNTL, RTSEL_MASK, val);
if (ret < 0)
return ret;
goto tw9910_set_fmt_error;
/*
* set scale
*/
ret = tw9910_set_scale(priv->client, priv->scale);
if (ret < 0)
return ret;
goto tw9910_set_fmt_error;
/*
* set cropping
*/
ret = tw9910_set_cropping(priv->client, &tw9910_cropping_ctrl);
if (ret < 0)
return ret;
goto tw9910_set_fmt_error;
/*
* set hsync
*/
ret = tw9910_set_hsync(priv->client, &tw9910_hsync_ctrl);
if (ret < 0)
goto tw9910_set_fmt_error;
return ret;
tw9910_set_fmt_error:
tw9910_reset(priv->client);
priv->scale = NULL;
return ret;
}