Commit 1016c6b8 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: disable clock in suspend 



Disable the IPA clock rather than dropping a reference to it in the
system suspend callback.  This forces the suspend to occur without
affecting existing references.

Similarly, enable the clock rather than taking a reference in
ipa_resume(), forcing a resume without changing the reference count.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ebd168c

drivers/net/ipa/ipa_clock.c

+3 −8
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int ipa_suspend(struct device *dev) 
		gsi_suspend(&ipa->gsi);

	}



	return ipa_clock_put(ipa);

	return ipa_clock_disable(ipa);

}



/**
@@ -432,14 +432,9 @@ static int ipa_resume(struct device *dev) 
	struct ipa *ipa = dev_get_drvdata(dev);

	int ret;



	/* This clock reference will keep the IPA out of suspend

	 * until we get a power management suspend request.

	 */

	ret = ipa_clock_get(ipa);

	if (WARN_ON(ret < 0)) {

		(void)ipa_clock_put(ipa);

	ret = ipa_clock_enable(ipa);

	if (WARN_ON(ret < 0))

		return ret;

	}



	/* Endpoints aren't usable until setup is complete */

	if (ipa->setup_complete) {