diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-04-29 19:20:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:33 -0400 |
| commit | ad3f3cf489311af25f91bade664a1688896245e9 (patch) | |
| tree | c0282d1d4e8ddae54ded5e13f6ef4fe4f74c944e /drivers/rtc/rtc-tps6586x.c | |
| parent | 569b05a300dc0307ad69aaa5dbe1cf4601bb3af8 (diff) | |
drivers/rtc/rtc-tps6586x.c: remove incorrect use of rtc_device_unregister
Device managed functions do not need explicit freeing/unregistering.
Moreover in this case it was done using non-device managed function
which is incorrect. Hence remove it.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Laxman dewangan <ldewangan@nvidia.com>
Cc: Chiwoong Byun <woong.byun@samsung.com>
Cc: Jonghwa Lee <jonghwa3.lee@samsung.com>
Cc: Venu Byravarasu <vbyravarasu@nvidia.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-tps6586x.c')
| -rw-r--r-- | drivers/rtc/rtc-tps6586x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c index badfea491a93..459c2ffc95a6 100644 --- a/drivers/rtc/rtc-tps6586x.c +++ b/drivers/rtc/rtc-tps6586x.c | |||
| @@ -289,15 +289,12 @@ static int tps6586x_rtc_probe(struct platform_device *pdev) | |||
| 289 | if (ret < 0) { | 289 | if (ret < 0) { |
| 290 | dev_err(&pdev->dev, "request IRQ(%d) failed with ret %d\n", | 290 | dev_err(&pdev->dev, "request IRQ(%d) failed with ret %d\n", |
| 291 | rtc->irq, ret); | 291 | rtc->irq, ret); |
| 292 | goto fail_req_irq; | 292 | goto fail_rtc_register; |
| 293 | } | 293 | } |
| 294 | disable_irq(rtc->irq); | 294 | disable_irq(rtc->irq); |
| 295 | device_set_wakeup_capable(&pdev->dev, 1); | 295 | device_set_wakeup_capable(&pdev->dev, 1); |
| 296 | return 0; | 296 | return 0; |
| 297 | 297 | ||
| 298 | fail_req_irq: | ||
| 299 | rtc_device_unregister(rtc->rtc); | ||
| 300 | |||
| 301 | fail_rtc_register: | 298 | fail_rtc_register: |
| 302 | tps6586x_update(tps_dev, RTC_CTRL, 0, | 299 | tps6586x_update(tps_dev, RTC_CTRL, 0, |
| 303 | RTC_ENABLE | OSC_SRC_SEL | PRE_BYPASS | CL_SEL_MASK); | 300 | RTC_ENABLE | OSC_SRC_SEL | PRE_BYPASS | CL_SEL_MASK); |