From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 948A8C433EF for ; Sat, 11 Sep 2021 19:11:52 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2F1B6108B for ; Sat, 11 Sep 2021 19:11:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A2F1B6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2952D83871; Sat, 11 Sep 2021 21:11:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dLx33qqf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 256BF83853; Sat, 11 Sep 2021 21:11:47 +0200 (CEST) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0683083872 for ; Sat, 11 Sep 2021 21:11:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x72b.google.com with SMTP id p4so5986569qki.3 for ; Sat, 11 Sep 2021 12:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wQizK24wWQpSY8hu6HaV51nQiE3bpPd+WR/UewIZSKM=; b=dLx33qqf0P2jOOWroM/xlGntVQeqwEaq17nvb8rLHvFbN8wHTsJVWy23DVMka77CfY 3eFS9C0NjipCKU8B4ZZP4DMYsk/3bnn8zL7My6H+t6/WWPZNbJ6YnPPxjikMK7eY1ShF ZUR8O/nkvIXFCcTUTUwXfBmvDg2CYoN8HLkg4NUqzgqzDPa7LGXrhX/7BKbRjIaahYPC zsSORjjlpB/oufJo/Glw4T2ZfTUjgBd8TRrkTXEpoBkwYZ+fFy20Zoa3yH4CI4Q21wca gI1vaItTrOLUAurGO8JNbQU5tQwf60BXqod9oeRSGRYKYYMO7/Iyx0fEwpRrF27ujwMu SsCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wQizK24wWQpSY8hu6HaV51nQiE3bpPd+WR/UewIZSKM=; b=NwCAXaZf7ps1ILbFpy0UrkdvlrO2XjsnER8BtRUhKMBaOL3t+a6ZvkVTkul31RIv89 iO6IN9xrpI7u+/+1Vn3qFdYNImgmXjb7Tt7jYGWXE5f8+UICGCAiwyN3qHT/BTyHFLru uHabp8GE7djZ7VvFPJbqdTMw7IRNdnM67OANKFO+3gmGxRbKYVKIcgdwGPk6G+LI65Pg zulRwOlpmT8fV7QxVWA4zqhhI2cXNLx5i3lBRTH/PlEi24Z2w9SPRf8/7Rc4Wseb63C/ CrMGHqddnuLvx+3npYpozW9vwnFjIxM378D9/Ru/QgDtDdpOzH+HylmCp3XqTT5cnnlH yttw== X-Gm-Message-State: AOAM533Co5wFp1AOGStqQP5TpeZqlDlszBPkheITDDMo+cO5Is0hi11p ccfb8cD1D+lCwPq1Ird/3oA= X-Google-Smtp-Source: ABdhPJxObNkTkhqEELAm2p8XKeIrBUxgILBwAJIeImQbJPgRFbn440vhHA/qiqfYTHAnGbtpSX39HA== X-Received: by 2002:a05:620a:897:: with SMTP id b23mr3168849qka.34.1631387501664; Sat, 11 Sep 2021 12:11:41 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-45-127-224.washdc.fios.verizon.net. [108.45.127.224]) by smtp.gmail.com with ESMTPSA id m68sm1765311qkb.105.2021.09.11.12.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 12:11:41 -0700 (PDT) From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Stefan Roese , Leo Liang , Meng Li , Sean Anderson Subject: [PATCH] wdt: dw: Fix passing NULL pointer to reset functions Date: Sat, 11 Sep 2021 15:11:30 -0400 Message-Id: <20210911191130.931814-1-seanga2@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean reset_*_bulk expects a real pointer. Fixes: 4f7abafe1c ("driver: watchdog: reset watchdog in designware_wdt_stop() function") Signed-off-by: Sean Anderson --- drivers/watchdog/designware_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index afed81e6c6..cfec29bd15 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -22,7 +22,7 @@ struct designware_wdt_priv { void __iomem *base; unsigned int clk_khz; - struct reset_ctl_bulk *resets; + struct reset_ctl_bulk resets; }; /* @@ -99,11 +99,11 @@ static int designware_wdt_stop(struct udevice *dev) if (CONFIG_IS_ENABLED(DM_RESET)) { int ret; - ret = reset_assert_bulk(priv->resets); + ret = reset_assert_bulk(&priv->resets); if (ret) return ret; - ret = reset_deassert_bulk(priv->resets); + ret = reset_deassert_bulk(&priv->resets); if (ret) return ret; } @@ -156,11 +156,11 @@ static int designware_wdt_probe(struct udevice *dev) #endif if (CONFIG_IS_ENABLED(DM_RESET)) { - ret = reset_get_bulk(dev, priv->resets); + ret = reset_get_bulk(dev, &priv->resets); if (ret) goto err; - ret = reset_deassert_bulk(priv->resets); + ret = reset_deassert_bulk(&priv->resets); if (ret) goto err; } -- 2.33.0