diff --git a/[refs] b/[refs] index 21b58de7522d..c68de3b1c013 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ead55119ba58523c31f52365b5eb33f3bb34b3e +refs/heads/master: 437ea90cc3afdca5229b41c6b1d38c4842756cb9 diff --git a/trunk/drivers/rtc/rtc-88pm80x.c b/trunk/drivers/rtc/rtc-88pm80x.c index 7e050b44b2de..6367984e0565 100644 --- a/trunk/drivers/rtc/rtc-88pm80x.c +++ b/trunk/drivers/rtc/rtc-88pm80x.c @@ -339,7 +339,6 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev) out_rtc: pm80x_free_irq(chip, info->irq, info); out: - devm_kfree(&pdev->dev, info); return ret; } @@ -349,7 +348,6 @@ static int __devexit pm80x_rtc_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); rtc_device_unregister(info->rtc_dev); pm80x_free_irq(info->chip, info->irq, info); - devm_kfree(&pdev->dev, info); return 0; }