summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNiklas Cassel <nks@flawful.org>2015-02-01 02:08:50 +0100
committerBrian Norris <computersforpeace@gmail.com>2015-02-07 22:55:47 -0800
commite1dd8641c8c36ff4aacf24c7e2575770e30afbe5 (patch)
treef18a2defea3e8e741b572fe754a22124ea8323f7 /drivers
parentd164ea32674ec82e80f480769ffcd2144f901380 (diff)
downloadop-kernel-dev-e1dd8641c8c36ff4aacf24c7e2575770e30afbe5.zip
op-kernel-dev-e1dd8641c8c36ff4aacf24c7e2575770e30afbe5.tar.gz
mtd: avoid registering reboot notifier twice
Calling mtd_device_parse_register with the same mtd_info (e.g. registering several partitions on a single device) would add the same reboot notifier twice, causing an infinte loop in notifier_chain_register during boot up. Signed-off-by: Niklas Cassel <nks@flawful.org> [Brian: add FIXME comments] Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/mtdcore.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index cbc0fc4..52eea93 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -577,7 +577,15 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,
err = -ENODEV;
}
- if (mtd->_reboot) {
+ /*
+ * FIXME: some drivers unfortunately call this function more than once.
+ * So we have to check if we've already assigned the reboot notifier.
+ *
+ * Generally, we can make multiple calls work for most cases, but it
+ * does cause problems with parse_mtd_partitions() above (e.g.,
+ * cmdlineparts will register partitions more than once).
+ */
+ if (mtd->_reboot && !mtd->reboot_notifier.notifier_call) {
mtd->reboot_notifier.notifier_call = mtd_reboot_notifier;
register_reboot_notifier(&mtd->reboot_notifier);
}
OpenPOWER on IntegriCloud