projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.103' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
mtd
/
ubi
/
build.c
diff --git
a/drivers/mtd/ubi/build.c
b/drivers/mtd/ubi/build.c
index 118cef7d1ecc2bd3e13d35eff9f7136b2ea1e4a2..7269afce27c96ccb0d200dfa52d7582ea3766a60 100644
(file)
--- a/
drivers/mtd/ubi/build.c
+++ b/
drivers/mtd/ubi/build.c
@@
-1168,6
+1168,9
@@
int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
goto out_detach;
}
goto out_detach;
}
+ /* Make device "available" before it becomes accessible via sysfs */
+ ubi_devices[ubi_num] = ubi;
+
err = uif_init(ubi, &ref);
if (err)
goto out_detach;
err = uif_init(ubi, &ref);
if (err)
goto out_detach;
@@
-1214,7
+1217,6
@@
int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
wake_up_process(ubi->bgt_thread);
spin_unlock(&ubi->wl_lock);
wake_up_process(ubi->bgt_thread);
spin_unlock(&ubi->wl_lock);
- ubi_devices[ubi_num] = ubi;
ubi_notify_all(ubi, UBI_VOLUME_ADDED, NULL);
return ubi_num;
ubi_notify_all(ubi, UBI_VOLUME_ADDED, NULL);
return ubi_num;
@@
-1225,6
+1227,7
@@
out_uif:
ubi_assert(ref);
uif_close(ubi);
out_detach:
ubi_assert(ref);
uif_close(ubi);
out_detach:
+ ubi_devices[ubi_num] = NULL;
ubi_wl_close(ubi);
ubi_free_internal_volumes(ubi);
kfree(ubi->vtbl);
ubi_wl_close(ubi);
ubi_free_internal_volumes(ubi);
kfree(ubi->vtbl);