diff options
Diffstat (limited to 'drivers/rtc/rtc-88pm80x.c')
-rw-r--r-- | drivers/rtc/rtc-88pm80x.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c index a2f956d90de0..6367984e0565 100644 --- a/drivers/rtc/rtc-88pm80x.c +++ b/drivers/rtc/rtc-88pm80x.c | |||
@@ -314,8 +314,8 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev) | |||
314 | 314 | ||
315 | info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev, | 315 | info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev, |
316 | &pm80x_rtc_ops, THIS_MODULE); | 316 | &pm80x_rtc_ops, THIS_MODULE); |
317 | ret = PTR_ERR(info->rtc_dev); | ||
318 | if (IS_ERR(info->rtc_dev)) { | 317 | if (IS_ERR(info->rtc_dev)) { |
318 | ret = PTR_ERR(info->rtc_dev); | ||
319 | dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); | 319 | dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); |
320 | goto out_rtc; | 320 | goto out_rtc; |
321 | } | 321 | } |
@@ -339,7 +339,6 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev) | |||
339 | out_rtc: | 339 | out_rtc: |
340 | pm80x_free_irq(chip, info->irq, info); | 340 | pm80x_free_irq(chip, info->irq, info); |
341 | out: | 341 | out: |
342 | devm_kfree(&pdev->dev, info); | ||
343 | return ret; | 342 | return ret; |
344 | } | 343 | } |
345 | 344 | ||
@@ -349,7 +348,6 @@ static int __devexit pm80x_rtc_remove(struct platform_device *pdev) | |||
349 | platform_set_drvdata(pdev, NULL); | 348 | platform_set_drvdata(pdev, NULL); |
350 | rtc_device_unregister(info->rtc_dev); | 349 | rtc_device_unregister(info->rtc_dev); |
351 | pm80x_free_irq(info->chip, info->irq, info); | 350 | pm80x_free_irq(info->chip, info->irq, info); |
352 | devm_kfree(&pdev->dev, info); | ||
353 | return 0; | 351 | return 0; |
354 | } | 352 | } |
355 | 353 | ||