From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41589 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbbEIR0L (ORCPT ); Sat, 9 May 2015 13:26:11 -0400 Subject: Patch "ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()" has been added to the 4.0-stable tree To: yongjun_wei@trendmicro.com.cn, broonie@kernel.org, gregkh@linuxfoundation.org, k.kozlowski.k@gmail.com Cc: , From: Date: Sat, 09 May 2015 19:24:50 +0200 Message-ID: <1431192290221124@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe() to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: asoc-samsung-s3c24xx-i2s-fix-return-value-check-in-s3c24xx_iis_dev_probe.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From c479163a1b6ab424786fbcd9225b4e3c1c58eb0b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 16 Apr 2015 20:18:02 +0800 Subject: ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe() From: Wei Yongjun 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 Reviewed-by: Krzysztof Kozlowski Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- 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; Patches currently in stable-queue which might be from yongjun_wei@trendmicro.com.cn are queue-4.0/asoc-samsung-s3c24xx-i2s-fix-return-value-check-in-s3c24xx_iis_dev_probe.patch queue-4.0/asoc-tfa9879-fix-return-value-check-in-tfa9879_i2c_probe.patch