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

Commit a4dc5255 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: fix compiler issue due to improper braces or indentation"

parents e8f731d7 8a7c4d96

drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c

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

/* Copyright (c) 2017-2020, 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
@@ -196,11 +196,12 @@ int cam_vfe_deinit_soc_resources(struct cam_hw_soc_info *soc_info) 
	if (rc)

	if (rc)

		CAM_ERR(CAM_ISP, "CPAS0 unregistration failed rc=%d", rc);

		CAM_ERR(CAM_ISP, "CPAS0 unregistration failed rc=%d", rc);





	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120)

	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120) {

		rc = cam_cpas_unregister_client(soc_private->cpas_handle[1]);

		rc = cam_cpas_unregister_client(soc_private->cpas_handle[1]);

		if (rc)

		if (rc)

			CAM_ERR(CAM_ISP, "CPAS1 unregistration failed rc=%d",

			CAM_ERR(CAM_ISP, "CPAS1 unregistration failed rc=%d",

				rc);

				rc);

	}





	rc = cam_vfe_release_platform_resource(soc_info);

	rc = cam_vfe_release_platform_resource(soc_info);

	if (rc < 0)

	if (rc < 0)
@@ -245,7 +246,7 @@ int cam_vfe_enable_soc_resources(struct cam_hw_soc_info *soc_info) 
		goto end;

		goto end;

	}

	}





	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120)

	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120) {

		rc = cam_cpas_start(soc_private->cpas_handle[1], &ahb_vote,

		rc = cam_cpas_start(soc_private->cpas_handle[1], &ahb_vote,

			&axi_vote);

			&axi_vote);

		if (rc) {

		if (rc) {
@@ -253,6 +254,7 @@ int cam_vfe_enable_soc_resources(struct cam_hw_soc_info *soc_info) 
			rc = -EFAULT;

			rc = -EFAULT;

			goto end;

			goto end;

		}

		}

	}





	rc = cam_soc_util_enable_platform_resource(soc_info, true,

	rc = cam_soc_util_enable_platform_resource(soc_info, true,

		CAM_TURBO_VOTE, true);

		CAM_TURBO_VOTE, true);
@@ -344,12 +346,13 @@ int cam_vfe_disable_soc_resources(struct cam_hw_soc_info *soc_info) 
		return rc;

		return rc;

	}

	}





	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120)

	if (!rc && soc_private->cpas_version == CAM_CPAS_TITAN_175_V120) {

		rc = cam_cpas_stop(soc_private->cpas_handle[1]);

		rc = cam_cpas_stop(soc_private->cpas_handle[1]);

		if (rc) {

		if (rc) {

			CAM_ERR(CAM_ISP, "Error! CPAS stop failed rc=%d", rc);

			CAM_ERR(CAM_ISP, "Error! CPAS stop failed rc=%d", rc);

			return rc;

			return rc;

		}

		}

	}





	return rc;

	return rc;

}
 
}

drivers/media/platform/msm/camera_v3/cam_utils/cam_packet_util.c

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

/* Copyright (c) 2017-2020, 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

drivers/soc/qcom/dcc_v2.c

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

/* Copyright (c) 2015-2020, 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

drivers/usb/phy/phy-msm-qusb.c

+2 −2
Original line number Original line Diff line number Diff line 
/*

/*

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

 * Copyright (c) 2014-2018, 2020, 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

drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c

+9 −9

File changed.

Contains only whitespace changes.