kernel: generic: 5.4: fix mtd concat panic on read/write functions
[openwrt/openwrt.git] / target / linux / generic / pending-5.4 / 498-mtd-mtdconcat-select-readwrite-function.patch
1 --- a/drivers/mtd/mtdconcat.c
2 +++ b/drivers/mtd/mtdconcat.c
3 @@ -642,8 +642,12 @@ struct mtd_info *mtd_concat_create(struc
4 concat->mtd._writev = concat_writev;
5 if (subdev[0]->_read_oob)
6 concat->mtd._read_oob = concat_read_oob;
7 + else
8 + concat->mtd._read = concat_read;
9 if (subdev[0]->_write_oob)
10 concat->mtd._write_oob = concat_write_oob;
11 + else
12 + concat->mtd._write = concat_write;
13 if (subdev[0]->_block_isbad)
14 concat->mtd._block_isbad = concat_block_isbad;
15 if (subdev[0]->_block_markbad)
16 @@ -701,8 +705,6 @@ struct mtd_info *mtd_concat_create(struc
17 concat->mtd.name = name;
18
19 concat->mtd._erase = concat_erase;
20 - concat->mtd._read = concat_read;
21 - concat->mtd._write = concat_write;
22 concat->mtd._sync = concat_sync;
23 concat->mtd._lock = concat_lock;
24 concat->mtd._unlock = concat_unlock;