From 437dbc63f096b8694ec888624305ca50d79ef4a7 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 1 Apr 2011 14:50:43 -0600
Subject: [PATCH] --- yaml --- r: 248246 b: refs/heads/master c:
 363618f013f2f11a1089b610748beb5de93b8630 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-jack.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3c5b4e33c15f..e272758309f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f94f3cb37a1c4d44dd2070cc4a6165689bda9c92
+refs/heads/master: 363618f013f2f11a1089b610748beb5de93b8630
diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c
index fcab80b36a37..6203a72d57af 100644
--- a/trunk/sound/soc/soc-jack.c
+++ b/trunk/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;