Message ID | 20210107143053.030563490@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, 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 E86E7C433E6 for <stable@archiver.kernel.org>; Thu, 7 Jan 2021 14:35:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6B4D22EBF for <stable@archiver.kernel.org>; Thu, 7 Jan 2021 14:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729734AbhAGOeH (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 7 Jan 2021 09:34:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:48130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729729AbhAGOeG (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 7 Jan 2021 09:34:06 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A496A23356; Thu, 7 Jan 2021 14:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1610030006; bh=FqVysjNP+b8PJG6ChRomrOjuYU/iFnz9gv4SFRb8mkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FnZwn/RUhw7m2nkX+0Q6kL1JzylxKREE/MvGDpgp5Vo5oqu7opj0gNF9sCXzj/8Jy qWPljaDDqzX73NTnV0jGIJ4bNq/ALm8Kb5hHBHoEC4lNKyErCp81RTYe49upo4Bxf7 JV6K6d7e80R+xrIzXnoqmmQz07wuFdQq1ncXIzlE= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Alexandre Belloni <alexandre.belloni@bootlin.com> Subject: [PATCH 5.10 04/20] rtc: pcf2127: only use watchdog when explicitly available Date: Thu, 7 Jan 2021 15:33:59 +0100 Message-Id: <20210107143053.030563490@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210107143052.392839477@linuxfoundation.org> References: <20210107143052.392839477@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/rtc/rtc-pcf2127.c +++ b/drivers/rtc/rtc-pcf2127.c @@ -336,7 +336,8 @@ static int pcf2127_watchdog_init(struct u32 wdd_timeout; int ret; - if (!IS_ENABLED(CONFIG_WATCHDOG)) + if (!IS_ENABLED(CONFIG_WATCHDOG) || + !device_property_read_bool(dev, "reset-source")) return 0; pcf2127->wdd.parent = dev;