lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 42/72] ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

    commit c479163a1b6ab424786fbcd9225b4e3c1c58eb0b upstream.

    In case of error, the function devm_ioremap_resource() returns
    ERR_PTR() and never returns NULL. The NULL test in the return
    value check should be replaced with IS_ERR().

    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Reviewed-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/samsung/s3c24xx-i2s.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/samsung/s3c24xx-i2s.c
    +++ b/sound/soc/samsung/s3c24xx-i2s.c
    @@ -461,8 +461,8 @@ static int s3c24xx_iis_dev_probe(struct
    return -ENOENT;
    }
    s3c24xx_i2s.regs = devm_ioremap_resource(&pdev->dev, res);
    - if (s3c24xx_i2s.regs == NULL)
    - return -ENXIO;
    + if (IS_ERR(s3c24xx_i2s.regs))
    + return PTR_ERR(s3c24xx_i2s.regs);

    s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO;
    s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO;



    \
     
     \ /
      Last update: 2015-05-11 21:21    [W:4.041 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site