diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-23 22:09:53 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-23 22:09:53 +0200 |
commit | 8123f88b8de62ce957c0a1e8a68060ceee685a36 (patch) | |
tree | 9ef2f3b3784761999aa27a2494eda8c6cdeee561 /drivers/rtc/rtc-pcf50606.c | |
parent | ee6baee93c67d4022c756642725e9985fbfd8332 (diff) | |
parent | 4eeac57dd1e056aedbe9d98756d9e5cd211c311b (diff) |
Merge branch 'pcf50606-2.6.31' into om-gta01-2.6.31
Diffstat (limited to 'drivers/rtc/rtc-pcf50606.c')
-rw-r--r-- | drivers/rtc/rtc-pcf50606.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-pcf50606.c b/drivers/rtc/rtc-pcf50606.c index 01ce1b9e48f..5004987100d 100644 --- a/drivers/rtc/rtc-pcf50606.c +++ b/drivers/rtc/rtc-pcf50606.c @@ -52,7 +52,7 @@ enum pcf50606_time_indexes { }; struct pcf50606_time { - u_int8_t time[PCF50606_TI_EXTENT]; + uint8_t time[PCF50606_TI_EXTENT]; }; struct pcf50606_rtc { @@ -301,12 +301,13 @@ static int __devexit pcf50606_rtc_remove(struct platform_device *pdev) struct pcf50606_rtc *rtc; rtc = platform_get_drvdata(pdev); - + + rtc_device_unregister(rtc->rtc_dev); + pcf50606_free_irq(rtc->pcf, PCF50606_IRQ_ALARM); pcf50606_free_irq(rtc->pcf, PCF50606_IRQ_SECOND); - - rtc_device_unregister(rtc->rtc_dev); + platform_set_drvdata(pdev, NULL); kfree(rtc); return 0; @@ -316,6 +317,7 @@ static int __devexit pcf50606_rtc_remove(struct platform_device *pdev) static struct platform_driver pcf50606_rtc_driver = { .driver = { .name = "pcf50606-rtc", + .owner = THIS_MODULE, }, .probe = pcf50606_rtc_probe, .remove = __devexit_p(pcf50606_rtc_remove), |