From patchwork Wed May 2 21:27:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 907717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40brw11gjBz9s4q; Thu, 3 May 2018 07:27:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fDzHW-0003NZ-1o; Wed, 02 May 2018 21:27:22 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1fDzHT-0003NT-Mu for kernel-team@lists.ubuntu.com; Wed, 02 May 2018 21:27:19 +0000 Received: from localhost (c-73-78-137-212.hsd1.co.comcast.net [73.78.137.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id D56FB33E0046 for ; Wed, 2 May 2018 15:27:16 -0600 (MDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH][SRU Bionic] firmware: arm_sdei: Fix return value check in sdei_present_dt() Date: Wed, 2 May 2018 15:27:08 -0600 Message-Id: <20180502212708.18529-1-dann.frazier@canonical.com> X-Mailer: git-send-email 2.17.0 X-Virus-Scanned: clamav-milter 0.99.4 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.3 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wei Yongjun BugLink: https://bugs.launchpad.net/bugs/1768663 In case of error, the function of_platform_device_create() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 677a60bd2003 ("firmware: arm_sdei: Discover SDEI support via ACPI") Acked-by: James Morse Signed-off-by: Wei Yongjun Signed-off-by: Catalin Marinas (cherry picked from commit 2f7aacf795e0192648b51674aef90e755e02408c) Signed-off-by: dann frazier Acked-by: Kleber Sacilotto de Souza Acked-by: Po-Hsu Lin --- drivers/firmware/arm_sdei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index 8f6563c595e5..1ea71640fdc2 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -1023,7 +1023,7 @@ static bool __init sdei_present_dt(void) pdev = of_platform_device_create(np, sdei_driver.driver.name, NULL); of_node_put(np); - if (IS_ERR(pdev)) + if (!pdev) return false; return true;