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

Commit 4caafd46 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: common: only register reset controllers which define resets"

parents 5bfefc73 fbecf4dc
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0-only
/*
 * Copyright (c) 2013-2014, 2017-2018, The Linux Foundation. All rights reserved.
 * Copyright (c) 2013-2014, 2017-2019, The Linux Foundation.
 * All rights reserved.
 */

#include <linux/export.h>
@@ -235,9 +236,11 @@ int qcom_cc_really_probe(struct platform_device *pdev,
	reset->regmap = regmap;
	reset->reset_map = desc->resets;

	if (desc->num_resets) {
		ret = devm_reset_controller_register(dev, &reset->rcdev);
		if (ret)
			return ret;
	}

	if (desc->gdscs && desc->num_gdscs) {
		scd = devm_kzalloc(dev, sizeof(*scd), GFP_KERNEL);