diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index a37b5ce9a6b2..287d839f98d0 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -2824,6 +2824,8 @@ err_late_init:
 		unregister_hotcpu_notifier(&etm4_cpu_notifier);
 		unregister_hotcpu_notifier(&etm4_cpu_dying_notifier);
 	}
+	etmdrvdata[drvdata->cpu] = NULL;
+	dev_set_drvdata(dev, NULL);
 	return ret;
 }