Merge "coresight: fix the mutex deadlock issue in cpu hotplug path"

	return NOTIFY_OK;

err1:

	if (--count == 0) {

		/* Release the cpu_add_remove_lock */

		cpu_maps_update_done();

		unregister_hotcpu_notifier(&etm_cpu_notifier);

		unregister_hotcpu_notifier(&etm_cpu_dying_notifier);

		/* Set to the original state of lock */

		cpu_maps_update_begin();

	}

	if (clk_disable[cpu]) {

		clk_disable_unprepare(etmdrvdata[cpu]->clk);