From patchwork Thu Aug 20 09:20:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 265587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 874CEC433E1 for ; Thu, 20 Aug 2020 11:09:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5883A2072D for ; Thu, 20 Aug 2020 11:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597921741; bh=+L89NUu3MbpLpCeF89RPkfWaaUFVqKtkxemjqpB3GH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GAcJadv1q2om45nuE/nbFTIkFd4vv2R2CCpeK50dcv4t16ImsV+L3O+PHPoU/W3U+ IjOz4Trms9wtFtFVvh/kzg6i362jIcTgQ3J8HUWU4k1eBOCeyBEHUtSzg1FDkylNtz oVDFjs7MGEZ6wdE4gqHjfwyJRUDV6hMPSiRjNn64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729308AbgHTLJA (ORCPT ); Thu, 20 Aug 2020 07:09:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:45342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730856AbgHTKJ6 (ORCPT ); Thu, 20 Aug 2020 06:09:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 02AFB206DA; Thu, 20 Aug 2020 10:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918197; bh=+L89NUu3MbpLpCeF89RPkfWaaUFVqKtkxemjqpB3GH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9uWuSaG8+cVfbIRIlkquR0WL2pQbBpGhPr55xcbRvWHM67XUu4D/VajcH5IzemrH tazDWtDTo/R4CrP3zmEaAhTVIKq8KrmeFwTnF3UeERc5U0sZ2btiU7I5u6hUZs1Gai GYaZRRj0EHzwGGjzSnLzqYGW1FsLmlusRoQsMOTw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Lu Wei , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.14 056/228] platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() Date: Thu, 20 Aug 2020 11:20:31 +0200 Message-Id: <20200820091610.406975888@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091607.532711107@linuxfoundation.org> References: <20200820091607.532711107@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lu Wei [ Upstream commit 64dd4a5a7d214a07e3d9f40227ec30ac8ba8796e ] In the function check_acpi_dev(), if it fails to create platform device, the return value is ERR_PTR() or NULL. Thus it must use IS_ERR_OR_NULL() to check return value. Fixes: 332e081225fc ("intel-vbtn: new driver for Intel Virtual Button") Reported-by: Hulk Robot Signed-off-by: Lu Wei Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- drivers/platform/x86/intel-vbtn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c index 58c5ff36523ab..d7fa2b88d27ab 100644 --- a/drivers/platform/x86/intel-vbtn.c +++ b/drivers/platform/x86/intel-vbtn.c @@ -178,7 +178,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; if (acpi_match_device_ids(dev, ids) == 0) - if (acpi_create_platform_device(dev, NULL)) + if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL))) dev_info(&dev->dev, "intel-vbtn: created platform device\n");