Message ID | 20180212224759.15999-40-alexandre.belloni@bootlin.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-rtc-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=<UNKNOWN>) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgLYn6Qy9z9sNw for <incoming@patchwork.ozlabs.org>; Tue, 13 Feb 2018 09:53:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933097AbeBLWwl (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 12 Feb 2018 17:52:41 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:37594 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933050AbeBLWsq (ORCPT <rfc822; linux-rtc@vger.kernel.org>); Mon, 12 Feb 2018 17:48:46 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 09329207E4; Mon, 12 Feb 2018 23:48:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5AA74207E8; Mon, 12 Feb 2018 23:48:15 +0100 (CET) From: Alexandre Belloni <alexandre.belloni@bootlin.com> To: linux-rtc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Belloni <alexandre.belloni@bootlin.com> Subject: [PATCH 39/45] rtc: stk17ta8: fix possible race condition Date: Mon, 12 Feb 2018 23:47:53 +0100 Message-Id: <20180212224759.15999-40-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180212224759.15999-1-alexandre.belloni@bootlin.com> References: <20180212224759.15999-1-alexandre.belloni@bootlin.com> Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-rtc.vger.kernel.org> X-Mailing-List: linux-rtc@vger.kernel.org |
Series |
RTC: nvmem improvements
|
expand
|
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index f936accf622f..1d6febbe7d39 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c @@ -334,11 +334,11 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev) pdata->rtc->ops = &stk17ta8_rtc_ops; - ret = rtc_register_device(pdata->rtc); + ret = sysfs_create_bin_file(&pdev->dev.kobj, &stk17ta8_nvram_attr); if (ret) return ret; - ret = sysfs_create_bin_file(&pdev->dev.kobj, &stk17ta8_nvram_attr); + ret = rtc_register_device(pdata->rtc); return ret; }
The probe function is not allowed to fail after registering the RTC. Call rtc_register_device() at the end. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/rtc/rtc-stk17ta8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)