From: Artem Bityutskiy Date: Fri, 3 Feb 2012 09:03:28 +0000 (+0200) Subject: mtd: mtdconcat: return -EOPNOTSUPP if block_markbad is undefined X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=79186876441278e7276d335448a4cb47fc4c1d8e;p=~shefty%2Frdma-dev.git mtd: mtdconcat: return -EOPNOTSUPP if block_markbad is undefined The main 'mtd_block_markbad()' function returns -EOPNOTSUPP if the '->block_markbad' method is undefined, and mtdconcat should do the same. Fix this by simply removing the 'mtd_can_have_bb()' because it is not really necessary. It could be treated as an optimization, but this function is expected to be used so rarely that it does not matter. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 5c7eb69c4ed..d826a8a50e7 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -673,9 +673,6 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs) struct mtd_concat *concat = CONCAT(mtd); int i, err = -EINVAL; - if (!mtd_can_have_bb(concat->subdev[0])) - return 0; - if (ofs > mtd->size) return -EINVAL;