Merge "msm: camera: sensor: unregister subdev if cpas registration fails" (5f9f2095) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/jpeg_enc_hw/cam_jpeg_enc_hw_info_ver_4_2_0.h

+2 −2

Original line number	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
		* it under the terms of the GNU General Public License version 2 and
		@@ -65,7 +65,7 @@ static struct cam_jpeg_enc_device_hw_info cam_jpeg_enc_hw_info = {
		.int_mask_disable_all = 0x00000000,
		.int_mask_enable_all = 0xFFFFFFFF,
		.hw_cmd_start = 0x00000001,
		.reset_cmd = 0x00032093,
		.reset_cmd = 0x200320D3,
		.hw_cmd_stop = 0x00000002,
		},
		.int_status = {

+5 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, 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
		* it under the terms of the GNU General Public License version 2 and
		@@ -188,13 +188,16 @@ static int32_t cam_csiphy_platform_probe(struct platform_device *pdev)
		rc = cam_cpas_register_client(&cpas_parms);
		if (rc) {
		CAM_ERR(CAM_CSIPHY, "CPAS registration failed rc: %d", rc);
		goto csiphy_no_resource;
		goto csiphy_unregister_subdev;
		}
		CAM_DBG(CAM_CSIPHY, "CPAS registration successful handle=%d",
		cpas_parms.client_handle);
		new_csiphy_dev->cpas_handle = cpas_parms.client_handle;

		return rc;

		csiphy_unregister_subdev:
		cam_unregister_subdev(&(new_csiphy_dev->v4l2_dev_str));
		csiphy_no_resource:
		mutex_destroy(&new_csiphy_dev->mutex);
		kfree(new_csiphy_dev->ctrl_reg);