diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:00:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:00:55 -0700 |
| commit | 71e9e6a5823a6b7976c3e47e2f6c7ba364526a93 (patch) | |
| tree | ecfa8b3dfd8453dc632199890df3f065cedb1bd0 /drivers | |
| parent | 9ade0cf440a1e5800dc68eef2e77b8d9d83a6dff (diff) | |
| parent | 9cf3b5fa6f7b246784d62a2a7637a871290c9ab9 (diff) | |
| download | linux-3.10-71e9e6a5823a6b7976c3e47e2f6c7ba364526a93.tar.gz linux-3.10-71e9e6a5823a6b7976c3e47e2f6c7ba364526a93.tar.bz2 linux-3.10-71e9e6a5823a6b7976c3e47e2f6c7ba364526a93.zip | |
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
rtc: fix coh901331 startup crash
mach-ux500: fix i2c0 device setup regression
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-coh901331.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 316f484999b..80f9c88214c 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c @@ -220,6 +220,7 @@ static int __init coh901331_probe(struct platform_device *pdev) } clk_disable(rtap->clk); + platform_set_drvdata(pdev, rtap); rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops, THIS_MODULE); if (IS_ERR(rtap->rtc)) { @@ -227,11 +228,10 @@ static int __init coh901331_probe(struct platform_device *pdev) goto out_no_rtc; } - platform_set_drvdata(pdev, rtap); - return 0; out_no_rtc: + platform_set_drvdata(pdev, NULL); out_no_clk_enable: clk_put(rtap->clk); out_no_clk: |