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

Commit ef5a67f8 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: handle IPA RM timer destruction correctly"

parents 6936d39e 9cbf9519

drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c

+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ int ipa_rm_inactivity_timer_init(enum ipa_rm_resource_name resource_name, 
*/

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 ||
@@ -152,6 +153,10 @@ 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);



	memset(&ipa_rm_it_handles[resource_name], 0,

	       sizeof(struct ipa_rm_it_private));