From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424471AbcFMOmm (ORCPT ); Mon, 13 Jun 2016 10:42:42 -0400 Received: from m12-11.163.com ([220.181.12.11]:32842 "EHLO m12-11.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424353AbcFMOm1 (ORCPT ); Mon, 13 Jun 2016 10:42:27 -0400 From: weiyj_lk@163.com To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: Wei Yongjun , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: sti: fix return value check in uni_player_parse_dt_audio_glue() Date: Mon, 13 Jun 2016 14:39:57 +0000 Message-Id: <1465828797-17628-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CM-TRANSID: C8CowABnj1+8xV5XZ2INAA--.5613S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7WryUXr4DZw43KF4xCF4rXwb_yoWDWFg_Jw 4rur1kXryDZFy7trWq9ws8CFZ3WFnxCrWYgay7Kw13J34DJw1rta48Gry5ur4kXwsYyryq yryS9rWxAr1rGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnNdbUUUUUU== X-Originating-IP: [180.102.102.213] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbByh6H1lO+j+JPCgAAsA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun In case of error, the function syscon_regmap_lookup_by_phandle() 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 --- sound/soc/sti/uniperif_player.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c index ee1c7c2..1ac2db2 100644 --- a/sound/soc/sti/uniperif_player.c +++ b/sound/soc/sti/uniperif_player.c @@ -1029,9 +1029,9 @@ static int uni_player_parse_dt_audio_glue(struct platform_device *pdev, regmap = syscon_regmap_lookup_by_phandle(node, "st,syscfg"); - if (!regmap) { + if (IS_ERR(regmap)) { dev_err(&pdev->dev, "sti-audio-clk-glue syscf not found\n"); - return -EINVAL; + return PTR_ERR(regmap); } player->clk_sel = regmap_field_alloc(regmap, regfield[0]);