From patchwork Tue Apr 17 09:30:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 899159 X-Patchwork-Delegate: trini@ti.com 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.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="STh+UJXl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40QKjj6kyNz9s0x for ; Tue, 17 Apr 2018 19:30:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1AD9EC21DF8; Tue, 17 Apr 2018 09:30:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F3A4AC21C93; Tue, 17 Apr 2018 09:30:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E41AAC21C8B; Tue, 17 Apr 2018 09:30:25 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 8D030C21BE5 for ; Tue, 17 Apr 2018 09:30:25 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id s18so33506052wrg.9 for ; Tue, 17 Apr 2018 02:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=KB/9cHaLL6rRgcFOgl7FO/H2LwslTViFXLxBX2W6S/c=; b=STh+UJXlqizKedE/T+d+VgImu1of4P9JonUA0jftKmk1jDdF1UZL/ifbS34QUVTjiH ypvW8PnEunOhK+eygqJc5MbD2wtKjaT+BddJa5btCSiIbBDApEQWaFD1ERj/6PV6Tfp+ ghTr+RSuK/kIzBjQehh/fkledxGvtreLHt8j4bRLNPL6wU7Gz3n195oa30oXyJQmMcmv DDkwGFRJXhgO2qOrlJzEAy6+9dcNzOyudd088zk7Lz2+SFUYvPPyxFQCXYjyLHW/dOlj 08XRMxPu38VABJDqCrUsiG/cPNa6vQJ2qk+Pcpd2qVDbzXis6UFrV9C0sGciYvCEHS1W m1Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KB/9cHaLL6rRgcFOgl7FO/H2LwslTViFXLxBX2W6S/c=; b=QBoELlFriUi4DC4U6pdzXZ6JBz2osGR8PQ6fsdzxZf3mqGGrWAb3kad+/a0dbturyt ok/vnvE2FPizEYj6fU7luUWtpFA9CjANd8BSY5OuGPGPEwtyZrqTw/l7Zq1QmczhNm5G Oo4GYLcaIPNWhVyTSdVKXzJLkUPwI8NzEx3SLSOrcWDfm4q7sXAJgQgu3sxTl6wRFTZo ckDANt1g82vTFMGEUujfiyylE7KlqnFZBZmOJzdh7GNb29pC1/rXhcMz3c3/2MHW9Db7 sGiNtAriTMVDKXilTEuU7inj9MRpQEsOIjlXNp6hMkrMasAwddPMgyf2LzLjjiTU6fjc 0NmA== X-Gm-Message-State: ALQs6tC058iLIoYH1rwSGLncDyxO1qFt5JQxw1GAU6B3mI4VXtQhZjcI Xwm/w642v34Da3oWd8///0tQ1w== X-Google-Smtp-Source: AIpwx49DTPgKJNRvAhHWxhS1SdNon7GL8RPHUD68JOKetXfJTlW8PCjholHCYy2VIVz1767Kq5hzsg== X-Received: by 10.223.157.65 with SMTP id o1mr1023028wre.14.1523957425127; Tue, 17 Apr 2018 02:30:25 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 39sm24396124wry.89.2018.04.17.02.30.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Apr 2018 02:30:24 -0700 (PDT) From: Neil Armstrong To: trini@konsulko.com, u-boot@lists.denx.de Date: Tue, 17 Apr 2018 11:30:22 +0200 Message-Id: <1523957422-16552-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 Cc: linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH] reset: fix reset_get_bulk when phandle error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This fixes the Coverity Defect CID 175348 when dev_count_phandle_with_args() returns a negative value. Fixes: 0c28233903b5 ("reset: Add get/assert/deassert/release for bulk of reset signals") Signed-off-by: Neil Armstrong --- drivers/reset/reset-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c index 9a5c9c9..fa4f653 100644 --- a/drivers/reset/reset-uclass.c +++ b/drivers/reset/reset-uclass.c @@ -88,8 +88,8 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk) bulk->count = 0; count = dev_count_phandle_with_args(dev, "resets", "#reset-cells"); - if (!count) - return 0; + if (count < 1) + return count; bulk->resets = devm_kcalloc(dev, count, sizeof(struct reset_ctl), GFP_KERNEL);