diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
|---|---|---|
| committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
| commit | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch) | |
| tree | fbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /drivers/rtc/rtc-ds1286.c | |
| parent | 61516587513c84ac26e68e3ab008dc6e965d0378 (diff) | |
| parent | d410fa4ef99112386de5f218dd7df7b4fca910b4 (diff) | |
Merge branch 'docs-security' into docs-move
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) | |||
| 355 | goto out; | 355 | goto out; |
| 356 | } | 356 | } |
| 357 | spin_lock_init(&priv->lock); | 357 | spin_lock_init(&priv->lock); |
| 358 | platform_set_drvdata(pdev, priv); | ||
| 358 | rtc = rtc_device_register("ds1286", &pdev->dev, | 359 | rtc = rtc_device_register("ds1286", &pdev->dev, |
| 359 | &ds1286_ops, THIS_MODULE); | 360 | &ds1286_ops, THIS_MODULE); |
| 360 | if (IS_ERR(rtc)) { | 361 | if (IS_ERR(rtc)) { |
| @@ -362,7 +363,6 @@ static int __devinit ds1286_probe(struct platform_device *pdev) | |||
| 362 | goto out; | 363 | goto out; |
| 363 | } | 364 | } |
| 364 | priv->rtc = rtc; | 365 | priv->rtc = rtc; |
| 365 | platform_set_drvdata(pdev, priv); | ||
| 366 | return 0; | 366 | return 0; |
| 367 | 367 | ||
| 368 | out: | 368 | out: |