diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 15:08:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 15:08:31 -0700 |
| commit | fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb (patch) | |
| tree | 1f0aa5cc31baff8b0b392208d31b7f7ce3f02cee /drivers | |
| parent | a6ab948e6500306dcb415ec80bff5f9b93f41b90 (diff) | |
| parent | ce31332d3c77532d6ea97ddcb475a2b02dd358b4 (diff) | |
| download | lwn-fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb.tar.gz lwn-fcc4dc715113999c6c7b5d3087fade3ee8d0f6eb.zip | |
Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Initialize CLOCK_ID to HRTIMER_BASE table statically
rtc: max8925: Call dev_set_drvdata before rtc_device_register
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 174036dda786..20494b5edc3c 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; |