diff options
Diffstat (limited to 'drivers/rtc/rtc-da9052.c')
-rw-r--r-- | drivers/rtc/rtc-da9052.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index da6ab5291a41..78070255bd3f 100644 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c | |||
@@ -245,7 +245,7 @@ static int __devinit da9052_rtc_probe(struct platform_device *pdev) | |||
245 | "ALM", rtc); | 245 | "ALM", rtc); |
246 | if (ret != 0) { | 246 | if (ret != 0) { |
247 | rtc_err(rtc->da9052, "irq registration failed: %d\n", ret); | 247 | rtc_err(rtc->da9052, "irq registration failed: %d\n", ret); |
248 | goto err_mem; | 248 | return ret; |
249 | } | 249 | } |
250 | 250 | ||
251 | rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, | 251 | rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, |
@@ -259,8 +259,6 @@ static int __devinit da9052_rtc_probe(struct platform_device *pdev) | |||
259 | 259 | ||
260 | err_free_irq: | 260 | err_free_irq: |
261 | free_irq(rtc->irq, rtc); | 261 | free_irq(rtc->irq, rtc); |
262 | err_mem: | ||
263 | devm_kfree(&pdev->dev, rtc); | ||
264 | return ret; | 262 | return ret; |
265 | } | 263 | } |
266 | 264 | ||
@@ -271,7 +269,6 @@ static int __devexit da9052_rtc_remove(struct platform_device *pdev) | |||
271 | rtc_device_unregister(rtc->rtc); | 269 | rtc_device_unregister(rtc->rtc); |
272 | free_irq(rtc->irq, rtc); | 270 | free_irq(rtc->irq, rtc); |
273 | platform_set_drvdata(pdev, NULL); | 271 | platform_set_drvdata(pdev, NULL); |
274 | devm_kfree(&pdev->dev, rtc); | ||
275 | 272 | ||
276 | return 0; | 273 | return 0; |
277 | } | 274 | } |