diff options
| author | Zhaowei Yuan <zhaowei.yuan@samsung.com> | 2014-08-12 13:49:10 +0800 |
|---|---|---|
| committer | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2014-08-25 02:39:39 -0700 |
| commit | f2da514bae02f6089b1c8f23f4e7a7778d7f5842 (patch) | |
| tree | 485576899accae4df94d3238eea2308d62db3480 | |
| parent | 81154173d9618ea3401b3fc492e92fbefe26b760 (diff) | |
| download | linux-3.10-f2da514bae02f6089b1c8f23f4e7a7778d7f5842.tar.gz linux-3.10-f2da514bae02f6089b1c8f23f4e7a7778d7f5842.tar.bz2 linux-3.10-f2da514bae02f6089b1c8f23f4e7a7778d7f5842.zip | |
media: s5p_mfc: Remove unnecessary checking for fmt->type
If find_format(f, MFC_FMT_DEC) didn't return a NULL pointer,
then the value of fmt->type must be MFC_FMT_DEC. It's
unnecessary to check it here.
Change-Id: I6c1146d33e014465fbdf8b085f0264fd60788260
Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
| -rwxr-xr-x | drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 2dd5385a493..5d702ccf944 100755 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -452,12 +452,7 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) ret = -EINVAL; goto out; } - if (fmt->type != MFC_FMT_DEC) { - mfc_err("Wrong format selected, you should choose " - "format for decoding\n"); - ret = -EINVAL; - goto out; - } + if (!IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) { mfc_err("Not supported format.\n"); return -EINVAL; |