aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/twl6040.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-28 12:39:28 +0200
committerTakashi Iwai <tiwai@suse.de>2011-03-28 12:39:28 +0200
commite9c4a5e10e063647b12e393dd3149c95175fd5ff (patch)
treeb1547634fefe448d983a0f42320ad8603e156eaf /sound/soc/codecs/twl6040.c
parentc6b358748e19ce7e230b0926ac42696bc485a562 (diff)
parent19aab08d69e05c8d9a9ad315e59dd0493bf86045 (diff)
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
-rw-r--r--sound/soc/codecs/twl6040.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 482fcdb59bf..255901c4460 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -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);