aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2013-03-08 03:55:37 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:58:00 -0400
commit3cfd01f4a0d055bf51095887bc1f43ce0a4e9898 (patch)
treeee3e9ca5cbf8101758ed084a16955652737d9619
parentb58c82ce8e5094299951f12844b705efde597806 (diff)
ENGR00243315-4 MXC V4L2 Capture:Improve debug info for s_std
commit f8e1a3bb62eecf93a31a51c4dbe08a0214fa1d57 introduced an annoying kernel log by changing a pure debug info to error level. This patch reverts that change. Conflicts: drivers/media/video/mxc/capture/mxc_v4l2_capture.c Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 289cc885ae097bbf9849cb266679a2969e5c39a9)
-rwxr-xr-xdrivers/media/platform/mxc/capture/mxc_v4l2_capture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
index 5f4db9582aba..0d10d281d6c8 100755
--- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
@@ -1428,7 +1428,8 @@ exit:
1428 */ 1428 */
1429static int mxc_v4l2_s_std(cam_data *cam, v4l2_std_id e) 1429static int mxc_v4l2_s_std(cam_data *cam, v4l2_std_id e)
1430{ 1430{
1431 printk(KERN_ERR "In mxc_v4l2_s_std %Lx\n", e); 1431 pr_debug("In mxc_v4l2_s_std %Lx\n", e);
1432
1432 if (e == V4L2_STD_PAL) { 1433 if (e == V4L2_STD_PAL) {
1433 pr_debug(" Setting standard to PAL %Lx\n", V4L2_STD_PAL); 1434 pr_debug(" Setting standard to PAL %Lx\n", V4L2_STD_PAL);
1434 cam->standard.id = V4L2_STD_PAL; 1435 cam->standard.id = V4L2_STD_PAL;