diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
| commit | a23184ff45e565dc7275fa5b49aca4cd2762a4c6 (patch) | |
| tree | 8d47b65e6f94b45903cd032fc1926120adb8f9bd /drivers/mtd/devices/doc2001plus.c | |
| parent | e797e34a3f7cb82c4e5b249a525c9e857ac6eebd (diff) | |
| parent | f1a60a56b7ac367b5285694cd02574e4edbe4c47 (diff) | |
Merge remote-tracking branch 'remotes/ubifs-v3.1/master' into tegra-nand-next
Conflicts:
drivers/mtd/ubi/ubi.h
drivers/mtd/ubi/wl.c
Diffstat (limited to 'drivers/mtd/devices/doc2001plus.c')
| -rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index 09ae0adc3ad0..fed491f4b6f8 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c @@ -471,7 +471,7 @@ void DoCMilPlus_init(struct mtd_info *mtd) mtd->size = 0; mtd->erasesize = 0; - mtd->writesize = 512; + mtd->writebufsize = mtd->writesize = 512; mtd->oobsize = 16; mtd->owner = THIS_MODULE; mtd->erase = doc_erase; |