diff options
| author | Zhaowei Yuan <zhaowei.yuan@samsung.com> | 2014-08-12 14:41:42 +0800 |
|---|---|---|
| committer | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2014-08-25 03:03:05 -0700 |
| commit | bac26d261e96953624a1f2aa6150068264eeb416 (patch) | |
| tree | 04c2f63c70cbc8939e34aed094da415f3a991243 | |
| parent | f2da514bae02f6089b1c8f23f4e7a7778d7f5842 (diff) | |
| download | linux-3.10-bac26d261e96953624a1f2aa6150068264eeb416.tar.gz linux-3.10-bac26d261e96953624a1f2aa6150068264eeb416.tar.bz2 linux-3.10-bac26d261e96953624a1f2aa6150068264eeb416.zip | |
media: s5p_mfc: Correct improper log and revert file permission
This patch corrects an improper log and revert the permission
of 2 files to original state, which were modified by the
previous patches by mistake.
Change-Id: I388260dc3329faab2efdd260bf28149ebfc3685f
Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
| -rw-r--r--[-rwxr-xr-x] | drivers/media/platform/s5p-mfc/s5p_mfc.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index c67d4469c72..c67d4469c72 100755..100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 5d702ccf944..c6d18d0e2fa 100755..100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -428,7 +428,7 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { fmt = find_format(f, MFC_FMT_RAW); if (!fmt) { - mfc_err("Unsupported format for source.\n"); + mfc_err("Unsupported format for destination.\n"); return -EINVAL; } if (!IS_MFCV6(dev) && (fmt->fourcc != V4L2_PIX_FMT_NV12MT)) { |