Merge branch 'for-2.6.39' into for-2.6.40

[pandora-kernel.git] / sound / soc / codecs / twl6040.c

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 4bbf1b1..255901c 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -724,8 +724,8 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w,
        return 0;
 }
 
-void twl6040_hs_jack_report(struct snd_soc_codec *codec,
-                               struct snd_soc_jack *jack, int report)
+static void twl6040_hs_jack_report(struct snd_soc_codec *codec,
+                                  struct snd_soc_jack *jack, int report)
 {
        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
        int status;
@@ -1629,8 +1629,10 @@ static int twl6040_probe(struct snd_soc_codec *codec)
        priv->naudint = naudint;
        priv->workqueue = create_singlethread_workqueue("twl6040-codec");
 
-       if (!priv->workqueue)
+       if (!priv->workqueue) {
+               ret = -ENOMEM;
                goto work_err;
+       }
 
        INIT_DELAYED_WORK(&priv->delayed_work, twl6040_accessory_work);