diff options
| author | John Crispin <john@openwrt.org> | 2014-06-19 14:13:12 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-19 14:13:12 +0000 |
| commit | 0d5a6fd819f62d6110dc9ac122c63f40b436134a (patch) | |
| tree | 75fb8c9ae5e2fc2eebf5a94e343f1cdec0dad382 | |
| parent | 9284956ad87d5ed67fbf7246ea68a4f9544312f3 (diff) | |
| download | master-31e0f0ae-0d5a6fd819f62d6110dc9ac122c63f40b436134a.tar.gz master-31e0f0ae-0d5a6fd819f62d6110dc9ac122c63f40b436134a.tar.bz2 master-31e0f0ae-0d5a6fd819f62d6110dc9ac122c63f40b436134a.zip | |
kernel: drop now unused ubi forced detach patch
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41272
| -rw-r--r-- | target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch b/target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch deleted file mode 100644 index 0d4fff1ee5..0000000000 --- a/target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/drivers/mtd/ubi/cdev.c -+++ b/drivers/mtd/ubi/cdev.c -@@ -974,7 +974,7 @@ static long ubi_cdev_ioctl(struct file * - static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) - { -- int err = 0; -+ int err = 0, force = 0; - void __user *argp = (void __user *)arg; - - if (!capable(CAP_SYS_RESOURCE)) -@@ -1024,6 +1024,10 @@ static long ctrl_cdev_ioctl(struct file - } - - /* Detach an MTD device command */ -+ case UBI_IOCFDET: -+ force = 1; -+ /* no break */ -+ - case UBI_IOCDET: - { - int ubi_num; -@@ -1036,7 +1040,7 @@ static long ctrl_cdev_ioctl(struct file - } - - mutex_lock(&ubi_devices_mutex); -- err = ubi_detach_mtd_dev(ubi_num, 0); -+ err = ubi_detach_mtd_dev(ubi_num, force); - mutex_unlock(&ubi_devices_mutex); - break; - } ---- a/include/uapi/mtd/ubi-user.h -+++ b/include/uapi/mtd/ubi-user.h -@@ -168,6 +168,7 @@ - #define UBI_IOCATT _IOW(UBI_CTRL_IOC_MAGIC, 64, struct ubi_attach_req) - /* Detach an MTD device */ - #define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, __s32) -+#define UBI_IOCFDET _IOW(UBI_CTRL_IOC_MAGIC, 99, __s32) - - /* ioctl commands of UBI volume character devices */ - |