From 9932a1c6ab1c2bf8e0c409c24966f2e6008cc3f0 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 25 May 2011 12:56:51 +0200 Subject: [PATCH] --- yaml --- r: 257210 b: refs/heads/master c: a91d2bab355f3a5caa767d7316f80422bfcd2ad6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-stmp3xxx.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cecc6e613a98..d162895358c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46b21218145ecef0936eb4338a9e0ffef84f00cf +refs/heads/master: a91d2bab355f3a5caa767d7316f80422bfcd2ad6 diff --git a/trunk/drivers/rtc/rtc-stmp3xxx.c b/trunk/drivers/rtc/rtc-stmp3xxx.c index ac40f971a40e..90f05fe60620 100644 --- a/trunk/drivers/rtc/rtc-stmp3xxx.c +++ b/trunk/drivers/rtc/rtc-stmp3xxx.c @@ -176,6 +176,7 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev) free_irq(rtc_data->irq_alarm, &pdev->dev); free_irq(rtc_data->irq_1msec, &pdev->dev); rtc_device_unregister(rtc_data->rtc); + platform_set_drvdata(pdev, NULL); iounmap(rtc_data->io); kfree(rtc_data); @@ -216,11 +217,14 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) goto out_remap; } + platform_set_drvdata(pdev, rtc_data); + mxs_reset_block(rtc_data->io); __mxs_clrl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, rtc_data->io + STMP3XXX_RTC_PERSISTENT0); + rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev, &stmp3xxx_rtc_ops, THIS_MODULE); if (IS_ERR(rtc_data->rtc)) { @@ -244,8 +248,6 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) goto out_irq1; } - platform_set_drvdata(pdev, rtc_data); - return 0; out_irq1: @@ -256,6 +258,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) rtc_data->io + STMP3XXX_RTC_CTRL); rtc_device_unregister(rtc_data->rtc); out_remap: + platform_set_drvdata(pdev, NULL); iounmap(rtc_data->io); out_free: kfree(rtc_data);