Merge "coresight: stm: Fix null point issue in stm" (3d534c18) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/hwtracing/coresight/coresight-ost.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -281,14 +281,13 @@ EXPORT_SYMBOL(stm_ost_packet);

		int stm_set_ost_params(struct stm_drvdata *drvdata, size_t bitmap_size)
		{
		stmdrvdata = drvdata;

		drvdata->chs.bitmap = devm_kzalloc(drvdata->dev, bitmap_size,
		GFP_KERNEL);
		if (!drvdata->chs.bitmap)
		return -ENOMEM;

		bitmap_fill(drvdata->entities, OST_ENTITY_MAX);
		stmdrvdata = drvdata;

		return 0;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -870,11 +870,6 @@ static int stm_probe(struct amba_device adev, const struct amba_id id)
		BYTES_PER_CHANNEL), resource_size(res));
		}
		bitmap_size = BITS_TO_LONGS(drvdata->numsp) * sizeof(long);
		/* Store the driver data pointer for use in exported functions */
		ret = stm_set_ost_params(drvdata, bitmap_size);
		if (ret)
		return ret;


		guaranteed = devm_kzalloc(dev, bitmap_size, GFP_KERNEL);
		if (!guaranteed)
		@@ -904,6 +899,11 @@ static int stm_probe(struct amba_device adev, const struct amba_id id)
		goto stm_unregister;
		}

		/* Store the driver data pointer for use in exported functions */
		ret = stm_set_ost_params(drvdata, bitmap_size);
		if (ret)
		goto stm_unregister;

		pm_runtime_put(&adev->dev);

		dev_info(dev, "%s initialized with master %s\n", (char *)id->data,