diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
| commit | 7b1d8b4b3561c043a79d5933a7c1eb9266dc328d (patch) | |
| tree | 9c398aa20e22763a239d11eecf6fb4c1d06d4c97 /drivers/mtd/ubi/build.c | |
| parent | 0b0eada569b198aa3882cfec5874bc35a8a0fa14 (diff) | |
| parent | 4db0f1c3dbe6173fdf91cbeb83e250719332c6a3 (diff) | |
| download | barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.gz barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.xz | |
Merge branch 'for-next/mtd-nand'
Diffstat (limited to 'drivers/mtd/ubi/build.c')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index da409010f7..75fdee3692 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -159,7 +159,7 @@ static int uif_init(struct ubi_device *ubi, int *ref) dev_set_name(&ubi->dev, "%s.ubi", ubi->mtd->cdev.name); ubi->dev.id = DEVICE_ID_SINGLE; - ubi->dev.parent = &ubi->mtd->class_dev; + ubi->dev.parent = &ubi->mtd->dev; err = register_device(&ubi->dev); if (err) @@ -241,8 +241,8 @@ static int get_bad_peb_limit(const struct ubi_device *ubi, int max_beb_per1024) * is that all the bad eraseblocks of the chip are in * the MTD partition we are attaching (ubi->mtd). */ - if (ubi->mtd->master) - device_size = ubi->mtd->master->size; + if (ubi->mtd->parent) + device_size = ubi->mtd->parent->size; else device_size = ubi->mtd->size; |