forked from Minki/linux
drivers/rtc/rtc-omap.c: fix a memory leak
request_mem_region() will call kzalloc to allocate memory for struct resource. release_resource() unregisters the resource but does not free the allocated memory, thus use release_mem_region() instead to fix the memory leak. Also add a missing iounmap() in omap_rtc_remove(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Tony Lindgren <tony@atomide.com> Acked-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
554ec37aca
commit
19412ce9fc
@ -429,13 +429,14 @@ fail1:
|
||||
fail0:
|
||||
iounmap(rtc_base);
|
||||
fail:
|
||||
release_resource(mem);
|
||||
release_mem_region(mem->start, resource_size(mem));
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
static int __exit omap_rtc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rtc_device *rtc = platform_get_drvdata(pdev);
|
||||
struct resource *mem = dev_get_drvdata(&rtc->dev);
|
||||
|
||||
device_init_wakeup(&pdev->dev, 0);
|
||||
|
||||
@ -447,8 +448,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
|
||||
if (omap_rtc_timer != omap_rtc_alarm)
|
||||
free_irq(omap_rtc_alarm, rtc);
|
||||
|
||||
release_resource(dev_get_drvdata(&rtc->dev));
|
||||
rtc_device_unregister(rtc);
|
||||
iounmap(rtc_base);
|
||||
release_mem_region(mem->start, resource_size(mem));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user