ALSA: compress: Pass through return value of open ops callback

charleskeepax · tiwai · commit 749d32237bf3 · 2014-03-19T15:46:24.000+01:00
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 a0830db 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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ static int snd_compr_open(struct inode inode, struct file f)`
`133`	`133`	`kfree(data);`
`134`	`134`	`}`
`135`	`135`	`snd_card_unref(compr->card);`
`136`		`- return 0;`
	`136`	`+ return ret;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`static int snd_compr_free(struct inode inode, struct file f)`