ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[linux-2.6-block.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index fc017c0a7b5d332082ace1a212dff7eb268fb7c4..7c17b98d584609c4a9fd78afe5c019a43728db1f 100644 (file)
--- 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;