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

Commit 5f1c94b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: remove the buspm file"

parents fe366e7f 6b013ce6

drivers/platform/msm/msm_bus/msm-buspm-dev.c

deleted100644 → 0
+0 −0

Empty file deleted.

drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int msmbus_coresight_init_adhoc(struct platform_device *pdev, 
		return PTR_ERR(pdata);



	drvdata = platform_get_drvdata(pdev);

	dev_info(dev, "info: removed buspm module from kernel space\n");

	dev_dbg(dev, "info: removed buspm module from kernel space\n");

	if (IS_ERR_OR_NULL(drvdata)) {

		drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

		if (!drvdata) {