aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

mtd: ubi: block: wire-up device parent

Browse Source 
ubiblock devices were previously only identifyable by their name, but
not connected to their parent UBI volume device e.g. in sysfs.
Properly parent ubiblock device as descendant of a UBI volume device
to reflect device model hierachy.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Daniel Golle
2022-12-22 19:33:31 +00:00
committed by Richard Weinberger
parent 1ecf9e3904
commit 05b8773ca3
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/ubi/block.c
View File

@@ -419,7 +419,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
list_add_tail(&dev->list, &ubiblock_devices); list_add_tail(&dev->list, &ubiblock_devices);
/* Must be the last step: anyone can call file ops from now on */ /* Must be the last step: anyone can call file ops from now on */
ret = add_disk(dev->gd); ret = device_add_disk(vi->dev, dev->gd, NULL);
if (ret) if (ret)
goto out_remove_minor; goto out_remove_minor;

1
drivers/mtd/ubi/kapi.c
View File

@@ -79,6 +79,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol,
vi->name_len = vol->name_len; vi->name_len = vol->name_len;
vi->name = vol->name; vi->name = vol->name;
vi->cdev = vol->cdev.dev; vi->cdev = vol->cdev.dev;
vi->dev = &vol->dev;
} }
/** /**

1
include/linux/mtd/ubi.h
View File

@@ -110,6 +110,7 @@ struct ubi_volume_info {
int name_len; int name_len;
const char *name; const char *name;
dev_t cdev; dev_t cdev;
struct device *dev;
}; };
/** /**