Commit 05b8773c authored by Daniel Golle's avatar Daniel Golle Committed by Richard Weinberger
Browse files

mtd: ubi: block: wire-up device parent 



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: default avatarDaniel Golle <daniel@makrotopia.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 1ecf9e39

drivers/mtd/ubi/block.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int ubiblock_create(struct ubi_volume_info *vi) 
	list_add_tail(&dev->list, &ubiblock_devices);



	/* 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)

		goto out_remove_minor;

drivers/mtd/ubi/kapi.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = vol->name;

	vi->cdev = vol->cdev.dev;

	vi->dev = &vol->dev;

}



/**

include/linux/mtd/ubi.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct ubi_volume_info { 
	int name_len;

	const char *name;

	dev_t cdev;

	struct device *dev;

};



/**