From ce308ac8f9ea992071d4d1e285989f1ca893a278 Mon Sep 17 00:00:00 2001 From: David Collins Date: Mon, 8 Jul 2019 12:00:39 -0700 Subject: [PATCH] clk: qcom: common: only register reset controllers which define resets Add a condition check to ensure that a reset controller is only registered for a given clock controller inside of the qcom_cc_really_probe() function if more than 0 resets are defined for it. Change-Id: Iffdfce1f7609ccab184a61c4a448a7edc15bb4ab Signed-off-by: David Collins --- drivers/clk/qcom/common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index 4565ec7a4aff..6b93c82ccec8 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2013-2014, 2017-2019, The Linux Foundation. * All rights reserved. @@ -265,9 +265,11 @@ int qcom_cc_really_probe(struct platform_device *pdev, reset->regmap = regmap; reset->reset_map = desc->resets; - ret = devm_reset_controller_register(dev, &reset->rcdev); - if (ret) - return ret; + 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);