summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-04-01 14:50:43 -0600
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-03 21:43:23 +0900
commit363618f013f2f11a1089b610748beb5de93b8630 (patch)
treec0fa9e28614f25344dd4fc129e26b1c0b81a022c /sound/soc/soc-jack.c
parentf94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (diff)
downloadlinux-363618f013f2f11a1089b610748beb5de93b8630.tar.bz2
ASoC: Name jack GPIOs based on jack not codec
snd_soc_jack_gpio has a name field. Use that name when registering the IRQ, since this is far more informative than the codec driver name. This shows up in /proc/interrupts. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index fcab80b36a37..6203a72d57af 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -325,7 +325,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
gpio_handler,
IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING,
- jack->codec->dev->driver->name,
+ gpios[i].name,
&gpios[i]);
if (ret)
goto err;