Merge remote branch 'wireless-next/master' into ath6kl-next

[karo-tx-linux.git] / drivers / mtd / mtdchar.c

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 64efcbf087e92d11012787bdc0873f4c863b36be..50c6a1e7f675cea884a5a0bbb71fb061bfdfe932 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -877,10 +877,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
 
                if (copy_from_user(&offs, argp, sizeof(loff_t)))
                        return -EFAULT;
-               if (!mtd->block_markbad)
-                       ret = -EOPNOTSUPP;
-               else
-                       return mtd_block_markbad(mtd, offs);
+               return mtd_block_markbad(mtd, offs);
                break;
        }