From 905931c4c8225c9ebf4d98b48388628fec05a948 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 10 Jan 2012 15:10:44 -0800 Subject: [PATCH] --- yaml --- r: 283093 b: refs/heads/master c: 5f85d20d04cdc4c6ed15022a5ed76907ad88d4ae h: refs/heads/master i: 283091: a17c1da1adcca81b69f1c445beaae4c21e932217 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-wm831x.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d0f5885c7c7a..42028914904d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d65943e55bdd538640d0908bc9f3ead138b0431 +refs/heads/master: 5f85d20d04cdc4c6ed15022a5ed76907ad88d4ae diff --git a/trunk/drivers/rtc/rtc-wm831x.c b/trunk/drivers/rtc/rtc-wm831x.c index dabbd456dfe1..657c6f67b287 100644 --- a/trunk/drivers/rtc/rtc-wm831x.c +++ b/trunk/drivers/rtc/rtc-wm831x.c @@ -399,7 +399,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev) int alm_irq = platform_get_irq_byname(pdev, "ALM"); int ret = 0; - wm831x_rtc = kzalloc(sizeof(*wm831x_rtc), GFP_KERNEL); + wm831x_rtc = devm_kzalloc(&pdev->dev, sizeof(*wm831x_rtc), GFP_KERNEL); if (wm831x_rtc == NULL) return -ENOMEM; @@ -434,7 +434,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) return 0; err: - kfree(wm831x_rtc); return ret; } @@ -445,7 +444,6 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev) free_irq(alm_irq, wm831x_rtc); rtc_device_unregister(wm831x_rtc->rtc); - kfree(wm831x_rtc); return 0; }