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

Commit 8a1156a1 authored by Tejas Prajapati's avatar Tejas Prajapati
Browse files

msm: camera: sensor: unregister subdev if cpas registration fails 



In case if the CPAS registration is failed before freeing the
memory of the subdev, subdev need to be unregistered so that
subdev list entry will not become NULL and other subdev can
be added.

CRs-Fixed: 2708016
Change-Id: I464c73411596fc562fc7a190ddfa130f23ee487a
Signed-off-by: default avatarTejas Prajapati <tpraja@codeaurora.org>
parent 2612e6d4

drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

+4 −1
Original line number Diff line number Diff line
@@ -469,13 +469,16 @@ static int cam_cci_platform_probe(struct platform_device *pdev) 
	rc = cam_cpas_register_client(&cpas_parms);

	if (rc) {

		CAM_ERR(CAM_CCI, "CPAS registration failed");

		goto cci_no_resource;

		goto cci_unregister_subdev;

	}

	CAM_DBG(CAM_CCI, "CPAS registration successful handle=%d",

		cpas_parms.client_handle);

	new_cci_dev->cpas_handle = cpas_parms.client_handle;



	return rc;



cci_unregister_subdev:

	cam_unregister_subdev(&(new_cci_dev->v4l2_dev_str));

cci_no_resource:

	kfree(new_cci_dev);

	return rc;

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c

+5 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include "cam_csiphy_dev.h"
@@ -181,13 +181,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);