From 87a9c074694964227e6b532bff6d2e8e2a1c77ea Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Mon, 22 Feb 2010 20:39:31 +0200 Subject: [PATCH] --- yaml --- r: 195889 b: refs/heads/master c: 298304f1a554d44cf13391e531ced3cde69a8ce4 h: refs/heads/master i: 195887: 9a4427e1320c2467ebada88b13d7421c479be981 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdblock.c | 3 ++- trunk/drivers/mtd/mtdblock_ro.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c8a233d61b6..a0546422004c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 048d87199566663e4edc4880df3703c04bcf41d9 +refs/heads/master: 298304f1a554d44cf13391e531ced3cde69a8ce4 diff --git a/trunk/drivers/mtd/mtdblock.c b/trunk/drivers/mtd/mtdblock.c index 8e5da1e46076..7ce30a239ada 100644 --- a/trunk/drivers/mtd/mtdblock.c +++ b/trunk/drivers/mtd/mtdblock.c @@ -348,7 +348,8 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) if (!(mtd->flags & MTD_WRITEABLE)) dev->mbd.readonly = 1; - add_mtd_blktrans_dev(&dev->mbd); + if (add_mtd_blktrans_dev(&dev->mbd)) + kfree(dev); } static void mtdblock_remove_dev(struct mtd_blktrans_dev *dev) diff --git a/trunk/drivers/mtd/mtdblock_ro.c b/trunk/drivers/mtd/mtdblock_ro.c index 54ff2880cf65..d0d3f79f9d03 100644 --- a/trunk/drivers/mtd/mtdblock_ro.c +++ b/trunk/drivers/mtd/mtdblock_ro.c @@ -43,7 +43,8 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) dev->tr = tr; dev->readonly = 1; - add_mtd_blktrans_dev(dev); + if (add_mtd_blktrans_dev(dev)) + kfree(dev); } static void mtdblock_remove_dev(struct mtd_blktrans_dev *dev)