From 049285a901a00b9ade7f5e7932c39a786e7e2bba Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Thu, 14 Mar 2013 15:37:02 +0530 Subject: [PATCH] --- yaml --- r: 374775 b: refs/heads/master c: b60c7243863fd2a5059d2c3137ed31b797cd7848 h: refs/heads/master i: 374773: cc0a71579a4ef9e3a665f5c20a76d29672bc8531 374771: 51154a6cb597d356c5704deaba3ce1044059fe26 374767: 822dd04f3440f6c00a4d8777d118aace877cc03a v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/gpio.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 67df46662d8c..dc4c1f860ea6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4f8cde8343ace075fb3dae2d5bc796cdfaffbfd +refs/heads/master: b60c7243863fd2a5059d2c3137ed31b797cd7848 diff --git a/trunk/drivers/mtd/nand/gpio.c b/trunk/drivers/mtd/nand/gpio.c index e789e3f51710..0cc1394cbeb0 100644 --- a/trunk/drivers/mtd/nand/gpio.c +++ b/trunk/drivers/mtd/nand/gpio.c @@ -259,8 +259,6 @@ static int gpio_nand_remove(struct platform_device *dev) if (gpio_is_valid(gpiomtd->plat.gpio_rdy)) gpio_free(gpiomtd->plat.gpio_rdy); - kfree(gpiomtd); - return 0; } @@ -297,7 +295,7 @@ static int gpio_nand_probe(struct platform_device *dev) if (!res0) return -EINVAL; - gpiomtd = kzalloc(sizeof(*gpiomtd), GFP_KERNEL); + gpiomtd = devm_kzalloc(&dev->dev, sizeof(*gpiomtd), GFP_KERNEL); if (gpiomtd == NULL) { dev_err(&dev->dev, "failed to create NAND MTD\n"); return -ENOMEM; @@ -412,7 +410,6 @@ static int gpio_nand_probe(struct platform_device *dev) iounmap(gpiomtd->nand_chip.IO_ADDR_R); release_mem_region(res0->start, resource_size(res0)); err_map: - kfree(gpiomtd); return ret; }