From a679049ceb9278a0787acbe393c62c92786178d0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 Aug 2010 16:42:04 -0400 Subject: [PATCH] --- yaml --- r: 210687 b: refs/heads/master c: 8b865d5efd9205b131dd9a43a6f450c05d38aaa1 h: refs/heads/master i: 210685: 5e2042fe543c37cda53681c0bbea37c51f533a7a 210683: 3f6e8dbbb8fc227497eda75e8b971759d7e955cb 210679: 2d18e9655b97724fabd3b6631c82c7264576e84c 210671: 46a2ed1814ad6d9a3cc5c2958ff23edb37149963 210655: ba94c6b58b20ce6dd843c6c324fb5b1d1e5bf334 210623: 5b2c273c29a22eca944e51b894ae3dce91416e8d 210559: e66b26a1ac62214576ed1da4493f359c4853af40 210431: 45cf26c7e63351cc7e6022d4b8bfd9a293f3eb88 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/bf5xx_nand.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1c7a973ffa5b..4523c7e58337 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eac15a429a27cb74115daaf4c1127c5e854d50e4 +refs/heads/master: 8b865d5efd9205b131dd9a43a6f450c05d38aaa1 diff --git a/trunk/drivers/mtd/nand/bf5xx_nand.c b/trunk/drivers/mtd/nand/bf5xx_nand.c index 162c5ea2b773..6fbeefa3a766 100644 --- a/trunk/drivers/mtd/nand/bf5xx_nand.c +++ b/trunk/drivers/mtd/nand/bf5xx_nand.c @@ -682,7 +682,6 @@ static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) static int __devexit bf5xx_nand_remove(struct platform_device *pdev) { struct bf5xx_nand_info *info = to_nand_info(pdev); - struct mtd_info *mtd = NULL; platform_set_drvdata(pdev, NULL); @@ -690,11 +689,7 @@ static int __devexit bf5xx_nand_remove(struct platform_device *pdev) * and their partitions, then go through freeing the * resources used */ - mtd = &info->mtd; - if (mtd) { - nand_release(mtd); - kfree(mtd); - } + nand_release(&info->mtd); peripheral_free_list(bfin_nfc_pin_req); bf5xx_nand_dma_remove(info);