summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Lavnikevich <d.lavnikevich@sam-solutions.net>2013-05-16 16:02:16 +0300
committerJustin Waters <justin.waters@timesys.com>2013-11-07 12:19:31 -0500
commit0e6a7f58209bec3fa72e1f0d26188fb04380db6c (patch)
treea3afacc07f1635f08bb71647414f9cb47136bdfd
parent3badc0537c218f66d20f19c8169689bce7d3bbd2 (diff)
Cosmetic changes to tw9910 driver.
Disabled some warnings printing: in try_fmt and s_fmt functions - their return code indicates the correctness of applied formats so there is no need to print each time messages. Especially it is meaningfull since gstreamer v4l source plugins are usually trying several different formats until they found correct. Signed-off-by: Uladzimir Bely <u.bely@sam-solutions.net> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
-rw-r--r--drivers/media/video/tw9910.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 4b5528dd7ea9..d2e8b3067218 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -809,9 +809,6 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
};
int ret;
- WARN_ON(mf->field != V4L2_FIELD_ANY &&
- mf->field != V4L2_FIELD_INTERLACED_BT);
-
/*
* check color format
*/
@@ -837,13 +834,14 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
switch (mf->field) {
case V4L2_FIELD_ANY:
+ case V4L2_FIELD_NONE:
case V4L2_FIELD_INTERLACED:
mf->field = V4L2_FIELD_INTERLACED_BT;
break;
case V4L2_FIELD_INTERLACED_BT:
break;
default:
- dev_err(&client->dev, "Field type %d invalid.\n", mf->field);
+ return -EINVAL;
}
mf->code = V4L2_MBUS_FMT_UYVY8_2X8;