--- zzzz-none-000/linux-4.1.38/drivers/mtd/ubi/vmt.c	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/drivers/mtd/ubi/vmt.c	2020-11-25 10:06:48.000000000 +0000
@@ -408,6 +408,10 @@
 	struct ubi_device *ubi = vol->ubi;
 	int i, err, vol_id = vol->vol_id, reserved_pebs = vol->reserved_pebs;
 
+#if defined(CONFIG_BCM_KF_KERN_WARNING)
+	err = -EPERM;
+#endif
+
 	dbg_gen("remove device %d, volume %d", ubi->ubi_num, vol_id);
 	ubi_assert(desc->mode == UBI_EXCLUSIVE);
 	ubi_assert(vol == ubi->volumes[vol_id]);
@@ -453,6 +457,11 @@
 	if (!no_vtbl)
 		self_check_volumes(ubi);
 
+#if defined(CONFIG_BCM_KF_KERN_WARNING)
+	if (err == -EPERM) {
+		printk("vmt.c: ubi_remove_volume really returned an undefined error\n");
+	}
+#endif
 	return err;
 
 out_err: