Skip to contentSkip to conversation

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

PATCH In review Charles Keepax 3 participants 3 messages Mar 19, 2014

Subsystems (2)
Sound Sound - compressed audio
lore
Share & tools
lore

Charles Keepax

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 sound/core/compress_offload.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/core/compress_offload.c +1 -1
index 7a20897..7403f34 100644
@@ -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)
Signature · 1 line
1.7.2.5
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Charles Keepax

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 <[email protected]>
Acked-by Vinod Koul <[email protected]>
Signature · 1 line
~Vinod
Quoted 20 lines
---
 sound/core/compress_offload.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/core/compress_offload.c +1 -1
index 7a20897..7403f34 100644
@@ -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)
Signature · 1 line
1.7.2.5
#2 lore raw
In reply to Charles Keepax

At Wed, 19 Mar 2014 12:59:39 +0000,

Quoted 11 lines · Charles Keepax

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 <[email protected]>

Applied with ack by Vinod. I added Cc to stable.

thanks,

Takashi

Quoted 20 lines
---
 sound/core/compress_offload.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/core/compress_offload.c +1 -1
index 7a20897..7403f34 100644
@@ -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)
Signature · 1 line
1.7.2.5