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

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

Merge "msm: ipa: fix for race condition in IPA RM timer destruction"

parents 032d0fe6 57692b69

drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c

+1 −4
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ EXPORT_SYMBOL(ipa_rm_inactivity_timer_init); 
*/

int ipa_rm_inactivity_timer_destroy(enum ipa_rm_resource_name resource_name)

{

	unsigned long flags;

	IPADBG("%s: resource %d\n", __func__, resource_name);



	if (resource_name < 0 ||
@@ -154,9 +153,7 @@ int ipa_rm_inactivity_timer_destroy(enum ipa_rm_resource_name resource_name) 
		return -EINVAL;

	}



	spin_lock_irqsave(&ipa_rm_it_handles[resource_name].lock, flags);

	cancel_delayed_work(&ipa_rm_it_handles[resource_name].work);

	spin_unlock_irqrestore(&ipa_rm_it_handles[resource_name].lock, flags);

	cancel_delayed_work_sync(&ipa_rm_it_handles[resource_name].work);



	memset(&ipa_rm_it_handles[resource_name], 0,

	       sizeof(struct ipa_rm_it_private));