From patchwork Wed Apr 27 18:44:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1200 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:50:07 -0000 Delivered-To: patches@linaro.org Received: by 10.224.2.73 with SMTP id 9cs119243qai; Wed, 27 Apr 2011 11:44:42 -0700 (PDT) Received: by 10.236.114.195 with SMTP id c43mr2973277yhh.405.1303929881179; Wed, 27 Apr 2011 11:44:41 -0700 (PDT) Received: from e7.ny.us.ibm.com (e7.ny.us.ibm.com [32.97.182.137]) by mx.google.com with ESMTPS id d3si1503197vdw.128.2011.04.27.11.44.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Apr 2011 11:44:41 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.137 as permitted sender) client-ip=32.97.182.137; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.137 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3RIMAwx006017; Wed, 27 Apr 2011 14:22:10 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3RIibhl088082; Wed, 27 Apr 2011 14:44:37 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3RIibr3018198; Wed, 27 Apr 2011 14:44:37 -0400 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p3RIib4R018026; Wed, 27 Apr 2011 14:44:37 -0400 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 7A4651E750E; Wed, 27 Apr 2011 11:44:36 -0700 (PDT) From: John Stultz To: LKML Cc: Zhangfei Gao , Alessandro Zummo , Thomas Gleixner , John Stultz Subject: [PATCH] rtc: max8925: Set dev_set_drvdata before rtc_device_register Date: Wed, 27 Apr 2011 11:44:29 -0700 Message-Id: <1303929869-25249-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 From: Zhangfei Gao We now call rtc_read_alarm from rtc_device_register, so it is important that the rtc device is fully initialized prior to reigstration. Because of this, With rtc-max8925, we see NULL pointer errors, so call dev_set_drvdata before rtc_device_register Thomas: This should go in for 2.6.39. CC: Alessandro Zummo CC: Thomas Gleixner Signed-off-by: Zhangfei Gao [Reworded commit message -jstultz] Signed-off-by: John Stultz --- drivers/rtc/rtc-max8925.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c index 174036d..20494b5 100644 --- a/drivers/rtc/rtc-max8925.c +++ b/drivers/rtc/rtc-max8925.c @@ -257,6 +257,8 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev) goto out_irq; } + dev_set_drvdata(&pdev->dev, info); + info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev, &max8925_rtc_ops, THIS_MODULE); ret = PTR_ERR(info->rtc_dev); @@ -265,7 +267,6 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev) goto out_rtc; } - dev_set_drvdata(&pdev->dev, info); platform_set_drvdata(pdev, info); return 0;