From c05a861ec36aac2907d553162636dc85f09df83f Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Fri, 25 Jan 2013 11:50:27 -0300 Subject: [PATCH] --- yaml --- r: 360377 b: refs/heads/master c: eb82038f97f93c5f0ff274fb98a9fff741dc2f5e h: refs/heads/master i: 360375: ad51e21552cfe1a1d535742c4db430dd65bec3cd v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/physmap_of.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1e0402f86174..e6b091191cd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84cfbbb85a98c8c89407f108da9d102e5dfe2ae5 +refs/heads/master: eb82038f97f93c5f0ff274fb98a9fff741dc2f5e diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c index 263d9e1b8001..500d7f4f8028 100644 --- a/trunk/drivers/mtd/maps/physmap_of.c +++ b/trunk/drivers/mtd/maps/physmap_of.c @@ -68,9 +68,6 @@ static int of_flash_remove(struct platform_device *dev) kfree(info->list[i].res); } } - - kfree(info); - return 0; } @@ -199,8 +196,9 @@ static int of_flash_probe(struct platform_device *dev) map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access"); err = -ENOMEM; - info = kzalloc(sizeof(struct of_flash) + - sizeof(struct of_flash_list) * count, GFP_KERNEL); + info = devm_kzalloc(&dev->dev, + sizeof(struct of_flash) + + sizeof(struct of_flash_list) * count, GFP_KERNEL); if (!info) goto err_flash_remove;