summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-03-19 12:59:39 +0000
committerTakashi Iwai <tiwai@suse.de>2014-03-19 15:46:24 +0100
commit749d32237bf39e6576dd95bfdf24e4378e51716c (patch)
tree43f93ccebea62e9bafb971fa43344a3a71eb7ccb /sound/core
parent305564413c99514a14a49215790d96b8d71a6295 (diff)
downloadlinux-stable-749d32237bf39e6576dd95bfdf24e4378e51716c.tar.gz
linux-stable-749d32237bf39e6576dd95bfdf24e4378e51716c.tar.bz2
linux-stable-749d32237bf39e6576dd95bfdf24e4378e51716c.zip
ALSA: compress: Pass through return value of open ops callback
The snd_compr_open function would always return 0 even if the compressed ops open function failed, obviously this is incorrect. Looks like this was introduced by a small typo in: commit a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85 ALSA: Add a reference counter to card instance This patch returns the value from the compressed op as it should. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/compress_offload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 7a20897d33db..7403f348ed14 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -133,7 +133,7 @@ static int snd_compr_open(struct inode *inode, struct file *f)
kfree(data);
}
snd_card_unref(compr->card);
- return 0;
+ return ret;
}
static int snd_compr_free(struct inode *inode, struct file *f)