From patchwork Tue Jun 23 19:50:02 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: 223039 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=-10.0 required=3.0 tests=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=unavailable 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 095DDC433DF for ; Tue, 23 Jun 2020 21:44:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D03DB2078E for ; Tue, 23 Jun 2020 21:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948680; bh=cEEfnp8GM0YdC1p3hokCpsKZ1vVckL0y5eAVAhF52xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e4B77Elo/S/49PFD9a0/K7tnLMpfS+U9YlL8aVZaLnVtrvqYsN5/2yXT3xixuwL+e Qv1f2xw/eMawtCaxMN8jRkIkWjKdw/G3Ra+gYiUPE34XJOG+JSQS3nlZXCsf1DWwR5 0ZJ9FP372YQQ/8LzIMpZy8ea7wXK6CTCYTcuB6h4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388491AbgFWVoc (ORCPT ); Tue, 23 Jun 2020 17:44:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:39320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387783AbgFWUCM (ORCPT ); Tue, 23 Jun 2020 16:02:12 -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 BAD472082F; Tue, 23 Jun 2020 20:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942532; bh=cEEfnp8GM0YdC1p3hokCpsKZ1vVckL0y5eAVAhF52xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ubofZOKm1MxRemjA/L46LRPvd+TzC1H/g3LrgZiX0Ma0OO8dNkK/agZ448ePGMoC8 C991qDUhQFZ7SXDAlgSp6H5xx1+ypZFFSDPZP02UJtyJxYKbcjDL9W38+E1OpyK9mj ZEN3W36TwhUMOsmAG17o2fTEu6mhKDHdn4wcnmIw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Alexandre Belloni , Sasha Levin Subject: [PATCH 5.7 005/477] rtc: rc5t619: Fix an ERR_PTR vs NULL check Date: Tue, 23 Jun 2020 21:50:02 +0200 Message-Id: <20200623195407.843697778@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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: Dan Carpenter [ Upstream commit 11ddbdfb68e4f9791e4bd4f8d7c87d3f19670967 ] The devm_kzalloc() function returns NULL on error, it doesn't return error pointers so this check doesn't work. Fixes: 540d1e15393d ("rtc: rc5t619: Add Ricoh RC5T619 RTC driver") Signed-off-by: Dan Carpenter Link: https://lore.kernel.org/r/20200407092852.GI68494@mwanda Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/rtc-rc5t619.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-rc5t619.c b/drivers/rtc/rtc-rc5t619.c index 24e386ecbc7ed..dd1a20977478e 100644 --- a/drivers/rtc/rtc-rc5t619.c +++ b/drivers/rtc/rtc-rc5t619.c @@ -356,10 +356,8 @@ static int rc5t619_rtc_probe(struct platform_device *pdev) int err; rtc = devm_kzalloc(dev, sizeof(*rtc), GFP_KERNEL); - if (IS_ERR(rtc)) { - err = PTR_ERR(rtc); + if (!rtc) return -ENOMEM; - } rtc->rn5t618 = rn5t618;