Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5ee985 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Change warning logs to debug logs" into dev/msm-4.9-camx

parents 71fc3c55 9f3f5129

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+2 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -761,7 +761,7 @@ static int cam_mem_mgr_cleanup_table(void) 
				"Buffer inactive at idx=%d, continuing", i);

				"Buffer inactive at idx=%d, continuing", i);

			continue;

			continue;

		} else {

		} else {

			CAM_INFO(CAM_CRM,

			CAM_DBG(CAM_CRM,

			"Active buffer at idx=%d, possible leak needs unmapping",

			"Active buffer at idx=%d, possible leak needs unmapping",

			i);

			i);

			cam_mem_mgr_unmap_active_buf(i);

			cam_mem_mgr_unmap_active_buf(i);

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.c

+3 −3
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -859,7 +859,7 @@ int cam_soc_util_get_dt_properties(struct cam_hw_soc_info *soc_info) 




	count = of_property_count_strings(of_node, "reg-names");

	count = of_property_count_strings(of_node, "reg-names");

	if (count <= 0) {

	if (count <= 0) {

		CAM_WARN(CAM_UTIL, "no reg-names found for: %s",

		CAM_DBG(CAM_UTIL, "no reg-names found for: %s",

			soc_info->dev_name);

			soc_info->dev_name);

		count = 0;

		count = 0;

	}

	}
@@ -896,7 +896,7 @@ int cam_soc_util_get_dt_properties(struct cam_hw_soc_info *soc_info) 
	rc = of_property_read_string_index(of_node, "interrupt-names", 0,

	rc = of_property_read_string_index(of_node, "interrupt-names", 0,

		&soc_info->irq_name);

		&soc_info->irq_name);

	if (rc) {

	if (rc) {

		CAM_WARN(CAM_UTIL, "No interrupt line preset for: %s",

		CAM_DBG(CAM_UTIL, "No interrupt line preset for: %s",

			soc_info->dev_name);

			soc_info->dev_name);

		rc = 0;

		rc = 0;

	} else {

	} else {