summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:49 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:49 +0100
commitf772aa92c2c04d73c8dfc7f313af0877808ae16a (patch)
treef7317e76d1326f0d0cde019cf49fe243888f9f05 /drivers/mtd
parent7e33e8c076e7681b09b70641ab6783098ff99e69 (diff)
parentee69c588417972185a1a2d72aa553410493791c2 (diff)
downloadbarebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.gz
barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/build.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index dd90e17cb7..2ea66ed067 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -492,13 +492,13 @@ static int autoresize(struct ubi_device *ubi, int vol_id)
* @vid_hdr_offset: VID header offset
* @max_beb_per1024: maximum expected number of bad PEB per 1024 PEBs
*
- * This function attaches MTD device @mtd_dev to UBI and assign @ubi_num number
+ * This function attaches MTD device @mtd_dev to UBI and assigns @ubi_num number
* to the newly created UBI device, unless @ubi_num is %UBI_DEV_NUM_AUTO, in
* which case this function finds a vacant device number and assigns it
* automatically. Returns the new UBI device number in case of success and a
* negative error code in case of failure.
*
- * Note, the invocations of this function has to be serialized by the
+ * Note, the invocation of this function has to be serialized by the
* @ubi_devices_mutex.
*/
int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
@@ -693,7 +693,7 @@ out_free:
* UBI device is busy and cannot be destroyed, and %-EINVAL if it does not
* exist.
*
- * Note, the invocations of this function has to be serialized by the
+ * Note, the invocation of this function has to be serialized by the
* @ubi_devices_mutex.
*/
int ubi_detach_mtd_dev(int ubi_num, int anyway)