From patchwork Thu May 5 09:46:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 94216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wy0-f184.google.com (mail-wy0-f184.google.com [74.125.82.184]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 39F24B6FDB for ; Thu, 5 May 2011 19:46:36 +1000 (EST) Received: by wyb35 with SMTP id 35sf2934730wyb.11 for ; Thu, 05 May 2011 02:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:mime-version:x-beenthere:received-spf:from:to :cc:subject:date:message-id:x-mailer:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=EQkSoS79zEetw8hvmMEEjyFokVjmB174M/WAzmWssGg=; b=AAmDcm8Vg7fawl4X5wBU9Li+riMFG3HOAhBku1wuMz4/oaHTjNyc3eCvoik97VK3aM o473bsXX4kq/ZNuPyd9hiojUiFM8ka7i9jO6cEr3NVfB3ANhFZ9lHDPIVkgGrP3sU8Xo SZMkiNZnwe0rPulMQCWvsMeTw56aULk7itf+8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:x-sa-exim-connect-ip:x-sa-exim-mail-from :x-sa-exim-scanned:x-ptx-original-recipient:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; b=Iqv0l460jnwXDUWoNzLk+NcxtmmBKfS3UuANz7ag0m3S1GukrKpMCTJSFKRxqOO67Y YTq87nRO/Dgn7DqQLOgwnOJJJtSCl5XsYbZ/1CNiJhE7ysr58+G3q40av3TFtrbJEAkU oBGJ+Y++vQFMWVF3cM0mI6/wv0blz1xQ050Go= Received: by 10.216.60.8 with SMTP id t8mr759763wec.16.1304588791844; Thu, 05 May 2011 02:46:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.216.208.214 with SMTP id q64ls864733weo.1.gmail; Thu, 05 May 2011 02:46:31 -0700 (PDT) Received: by 10.216.221.17 with SMTP id q17mr409411wep.6.1304588790955; Thu, 05 May 2011 02:46:30 -0700 (PDT) Received: by 10.216.221.17 with SMTP id q17mr409410wep.6.1304588790934; Thu, 05 May 2011 02:46:30 -0700 (PDT) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gmr-mx.google.com with ESMTPS id n57si326257wer.9.2011.05.05.02.46.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 May 2011 02:46:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from katana.hi.pengutronix.de ([2001:6f8:1178:2:221:70ff:fe71:1890] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1QHv8g-0003hx-6D; Thu, 05 May 2011 11:46:30 +0200 From: Wolfram Sang To: rtc-linux@googlegroups.com Cc: Wolfram Sang , john stultz , Alessandro Zummo (maintainer:REAL TIME CLOCK (...), linux-kernel@vger.kernel.org (open list) Subject: [rtc-linux] [PATCH 1/2] rtc: davinci: fix crash on boot Date: Thu, 5 May 2011 11:46:14 +0200 Message-Id: <1304588775-30408-1-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.7.2.5 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Sender: w.sang@pengutronix.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=w.sang@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Commit f44f7f96a20 ("RTC: Initialize kernel state from RTC") caused a crash when initializing the driver. The reason is that rtc_device_register() calls rtc_read_alarm() after that change, when the driver does not have all driver data set up yet. Signed-off-by: Wolfram Sang Cc: john stultz Acked-by: John Stultz --- Found by this coccinelle-script: @ init @ identifier drvdata, ptr; @@ struct drvdata { ... void *ptr; ... }; @ main depends on init @ expression E, ret; identifier data; @@ + platform_set_drvdata(E, data); ret = rtc_device_register(...); ... - platform_set_drvdata(E, data); and then manually edited. drivers/rtc/rtc-davinci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 8d46838..755e1fe 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -524,6 +524,8 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) goto fail2; } + platform_set_drvdata(pdev, davinci_rtc); + davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, &davinci_rtc_ops, THIS_MODULE); if (IS_ERR(davinci_rtc->rtc)) { @@ -553,8 +555,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) rtcss_write(davinci_rtc, PRTCSS_RTC_CCTRL_CAEN, PRTCSS_RTC_CCTRL); - platform_set_drvdata(pdev, davinci_rtc); - device_init_wakeup(&pdev->dev, 0); return 0; @@ -562,6 +562,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) fail4: rtc_device_unregister(davinci_rtc->rtc); fail3: + platform_set_drvdata(pdev, NULL); iounmap(davinci_rtc->base); fail2: release_mem_region(davinci_rtc->pbase, davinci_rtc->base_size);