renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

[media] ov772x: Don't fail in s_fmt if the requested format isn't supported

Browse Source 
Select a default format instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2012-07-18 10:58:20 -03:00 committed by Mauro Carvalho Chehab
parent ca9ef7fa21
commit 69c80dc901
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
drivers/media/i2c/soc_camera/ov772x.c
View File

@ -581,11 +581,6 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
return 0; return 0;
} }
if (!priv->win || !priv->cfmt) {
dev_err(&client->dev, "norm or win select error\n");
return -EPERM;
}
ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, 0); ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, 0);
dev_dbg(&client->dev, "format %d, win %s\n", dev_dbg(&client->dev, "format %d, win %s\n",
@ -710,31 +705,33 @@ static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
return win; return win;
} }
static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height, static void ov772x_select_params(const struct v4l2_mbus_framefmt *mf,
enum v4l2_mbus_pixelcode code) const struct ov772x_color_format **cfmt,
const struct ov772x_win_size **win)
{ {
struct ov772x_priv *priv = to_ov772x(client); unsigned int i;
int ret = -EINVAL;
u8 val; /* Select a format. */
int i; *cfmt = &ov772x_cfmts[0];
/*
* select format
*/
priv->cfmt = NULL;
for (i = 0; i < ARRAY_SIZE(ov772x_cfmts); i++) { for (i = 0; i < ARRAY_SIZE(ov772x_cfmts); i++) {
if (code == ov772x_cfmts[i].code) { if (mf->code == ov772x_cfmts[i].code) {
priv->cfmt = ov772x_cfmts + i; *cfmt = &ov772x_cfmts[i];
break; break;
} }
} }
if (!priv->cfmt)
goto ov772x_set_fmt_error;
/* /* Select a window size. */
* select win *win = ov772x_select_win(mf->width, mf->height);
*/ }
priv->win = ov772x_select_win(*width, *height);
static int ov772x_set_params(struct ov772x_priv *priv,
const struct ov772x_color_format *cfmt,
const struct ov772x_win_size *win)
{
struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
int ret;
u8 val;
/* /*
* reset hardware * reset hardware
@ -791,14 +788,14 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
/* /*
* set size format * set size format
*/ */
ret = ov772x_write_array(client, priv->win->regs); ret = ov772x_write_array(client, win->regs);
if (ret < 0) if (ret < 0)
goto ov772x_set_fmt_error; goto ov772x_set_fmt_error;
/* /*
* set DSP_CTRL3 * set DSP_CTRL3
*/ */
val = priv->cfmt->dsp3; val = cfmt->dsp3;
if (val) { if (val) {
ret = ov772x_mask_set(client, ret = ov772x_mask_set(client,
DSP_CTRL3, UV_MASK, val); DSP_CTRL3, UV_MASK, val);
@ -809,7 +806,7 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
/* /*
* set COM3 * set COM3
*/ */
val = priv->cfmt->com3; val = cfmt->com3;
if (priv->info->flags & OV772X_FLAG_VFLIP) if (priv->info->flags & OV772X_FLAG_VFLIP)
val |= VFLIP_IMG; val |= VFLIP_IMG;
if (priv->info->flags & OV772X_FLAG_HFLIP) if (priv->info->flags & OV772X_FLAG_HFLIP)
@ -827,7 +824,7 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
/* /*
* set COM7 * set COM7
*/ */
val = priv->win->com7_bit | priv->cfmt->com7; val = win->com7_bit | cfmt->com7;
ret = ov772x_mask_set(client, ret = ov772x_mask_set(client,
COM7, SLCT_MASK | FMT_MASK | OFMT_MASK, COM7, SLCT_MASK | FMT_MASK | OFMT_MASK,
val); val);
@ -846,16 +843,11 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
goto ov772x_set_fmt_error; goto ov772x_set_fmt_error;
} }
*width = priv->win->width;
*height = priv->win->height;
return ret; return ret;
ov772x_set_fmt_error: ov772x_set_fmt_error:
ov772x_reset(client); ov772x_reset(client);
priv->win = NULL;
priv->cfmt = NULL;
return ret; return ret;
} }
@ -899,18 +891,29 @@ static int ov772x_g_fmt(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int ov772x_s_fmt(struct v4l2_subdev *sd, static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
struct v4l2_mbus_framefmt *mf)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev); struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
int ret = ov772x_set_params(client, &mf->width, &mf->height, const struct ov772x_color_format *cfmt;
mf->code); const struct ov772x_win_size *win;
int ret;
if (!ret) ov772x_select_params(mf, &cfmt, &win);
mf->colorspace = priv->cfmt->colorspace;
return ret; ret = ov772x_set_params(priv, cfmt, win);
if (ret < 0)
return ret;
priv->win = win;
priv->cfmt = cfmt;
mf->code = cfmt->code;
mf->width = win->width;
mf->height = win->height;
mf->field = V4L2_FIELD_NONE;
mf->colorspace = cfmt->colorspace;
return 0;
} }
static int ov772x_try_fmt(struct v4l2_subdev *sd, static int ov772x_try_fmt(struct v4l2_subdev *sd,