lkml.org 
[lkml]   [2014]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 51/71] ALSA: compress: Pass through return value of open ops callback
    Date
    3.5.7.33 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>

    commit 749d32237bf39e6576dd95bfdf24e4378e51716c upstream.

    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>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/core/compress_offload.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
    index 794f37a..d38a2a9 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)
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-03-31 18:41    [W:5.797 / U:2.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site