aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-19 14:13:12 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-19 14:13:12 +0000
commitd3a5266f95859692f58b549cb8b76cd8598603e5 (patch)
treeb0121190891271c5a1365bf22559505999b29866 /target/linux/generic/patches-3.10
parente6af58406e7de2503b38d852162be0a3a0468943 (diff)
downloadupstream-d3a5266f95859692f58b549cb8b76cd8598603e5.tar.gz
upstream-d3a5266f95859692f58b549cb8b76cd8598603e5.tar.bz2
upstream-d3a5266f95859692f58b549cb8b76cd8598603e5.zip
kernel: drop now unused ubi forced detach patch
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41272 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10')
-rw-r--r--target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch41
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 */
-