]> git.karo-electronics.de Git - linux-beck.git/commit
ASoC: tegra+wm8903: unconditionally free jack GPIOs in remove
authorStephen Warren <swarren@nvidia.com>
Tue, 22 May 2012 22:08:56 +0000 (16:08 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 3 Jun 2012 12:06:36 +0000 (13:06 +0100)
commite44fbbd45896e684d44391aaf881dd3e36bd1a16
treedaebe04fd61db6e9f6b3ff093362696770728a6f
parente2d287c179a12a6069bc3b746e2e34edcddf81b3
ASoC: tegra+wm8903: unconditionally free jack GPIOs in remove

The headphone jack GPIOs are added/initialized in the DAI link's init()
method, and hence in theory may not always have been added before remove()
is called in some unusual cases. In order to prevent calling
snd_soc_jack_free_gpios() if snd_soc_jack_add_gpios() had not been, the
code kept track of the initialization state to avoid the free call when
necessary.

However, it appears that snd_soc_jack_free_gpios() is robust in the face
of being called without snd_soc_jack_add_gpios() first succeeding, so
there is little point manually tracking this information. Hence, remove
the tracking code. Almost all other machine drivers already operate this
way.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/tegra/tegra_wm8903.c