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

Commit bb938490 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Correct assignment of clock rates" into camera-kernel.lnx.4.0

parents 58bd7464 e1ea9ede

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

+7 −1
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

/*

/*

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

 * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.

 */

 */





#include <linux/slab.h>

#include <linux/slab.h>
@@ -1984,6 +1984,12 @@ int cam_tfe_cshiphy_callback( 
				&csid_clock_rate, &updated_tfe_clk);

				&csid_clock_rate, &updated_tfe_clk);

		}

		}

	}

	}



	if (!updated_csid_clk)

		updated_csid_clk = csid_clock_rate;



	if (!updated_tfe_clk)

		updated_tfe_clk = tfe_clock_rate;

end:

end:

	/* final check */

	/* final check */

	if ((*phy_clock_rate > updated_csid_clk) ||

	if ((*phy_clock_rate > updated_csid_clk) ||