Skip to content

Commit

Permalink
drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()
Browse files Browse the repository at this point in the history
Marginally less code and eliminate the possibility of memory leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Mark Brown authored and Linus Torvalds committed Jan 11, 2012
1 parent 2d65943 commit 5f85d20
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/rtc/rtc-wm831x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -434,7 +434,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
return 0;

err:
kfree(wm831x_rtc);
return ret;
}

Expand All @@ -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;
}
Expand Down

0 comments on commit 5f85d20

Please sign in to comment.