diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-12 11:31:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-12 11:31:13 +0200 |
| commit | 557d97d57446f55d2c4a66593794ea31ffd0a74d (patch) | |
| tree | 60a88a0c5a107997c9f19ee37f5de3b9aed1a487 /drivers/rtc/rtc-ds1286.c | |
| parent | clocksource: Install completely before selecting (diff) | |
| parent | rtc: mc13xxx: Don't call rtc_device_register while holding lock (diff) | |
| download | linux-557d97d57446f55d2c4a66593794ea31ffd0a74d.tar.xz linux-557d97d57446f55d2c4a66593794ea31ffd0a74d.zip | |
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'drivers/rtc/rtc-ds1286.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1286.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c index 60ce69600828..47e681df31e2 100644 --- a/drivers/rtc/rtc-ds1286.c +++ b/drivers/rtc/rtc-ds1286.c @@ -355,6 +355,7 @@ static int __devinit ds1286_probe(struct platform_device *pdev) goto out; } spin_lock_init(&priv->lock); + platform_set_drvdata(pdev, priv); rtc = rtc_device_register("ds1286", &pdev->dev, &ds1286_ops, THIS_MODULE); if (IS_ERR(rtc)) { @@ -362,7 +363,6 @@ static int __devinit ds1286_probe(struct platform_device *pdev) goto out; } priv->rtc = rtc; - platform_set_drvdata(pdev, priv); return 0; out: |