Commit ee8146aa authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight: dynamic-replicator: Clean up error handling 



We fail to disable the clock in case of a failure during the
probe. Clean this up. Also, we are supposed to drop the pm reference
only when the probing is successful.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08be8747

drivers/hwtracing/coresight/coresight-dynamic-replicator.c

+16 −8
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static const struct attribute_group *replicator_groups[] = { 


static int replicator_probe(struct amba_device *adev, const struct amba_id *id)

{

	int ret;

	int ret = 0;

	struct device *dev = &adev->dev;

	struct resource *res = &adev->res;

	struct coresight_platform_data *pdata = NULL;
@@ -180,12 +180,13 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) 


	/* Validity for the resource is already checked by the AMBA core */

	base = devm_ioremap_resource(dev, res);

	if (IS_ERR(base))

		return PTR_ERR(base);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		goto out_disable_clk;

	}



	drvdata->base = base;

	dev_set_drvdata(dev, drvdata);

	pm_runtime_put(&adev->dev);



	desc.type = CORESIGHT_DEV_TYPE_LINK;

	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;
@@ -195,11 +196,18 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.groups = replicator_groups;

	drvdata->csdev = coresight_register(&desc);



	if (!IS_ERR(drvdata->csdev)) {

		replicator_reset(drvdata);

		return 0;

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

		goto out_disable_clk;

	}

	return PTR_ERR(drvdata->csdev);



	replicator_reset(drvdata);

	pm_runtime_put(&adev->dev);



out_disable_clk:

	if (ret && !IS_ERR_OR_NULL(drvdata->atclk))

		clk_disable_unprepare(drvdata->atclk);

	return ret;

}



#ifdef CONFIG_PM

CRA Git | Maintained and supported by SUSTech CRA and CCSE