Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

1 files changed, 22 insertions, 9 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index f5061fe72e4c..d2f331876e4c 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/compatmac.h>
@@ -25,10 +26,13 @@ static void mtd_notify_add(struct mtd_info* mtd)
         if (!mtd)
                 return;
 
-        device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), "mtd%d", mtd->index);
+        device_create_drvdata(mtd_class, NULL,
+                              MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
+                              NULL, "mtd%d", mtd->index);
 
-        device_create(mtd_class, NULL,
-                      MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), "mtd%dro", mtd->index);
+        device_create_drvdata(mtd_class, NULL,
+                              MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
+                              NULL, "mtd%dro", mtd->index);
 }
 
 static void mtd_notify_remove(struct mtd_info* mtd)
@@ -84,6 +88,7 @@ static int mtd_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
         int devnum = minor >> 1;
+        int ret = 0;
         struct mtd_info *mtd;
         struct mtd_file_info *mfi;
 
@@ -96,31 +101,39 @@ static int mtd_open(struct inode *inode, struct file *file)
         if ((file->f_mode & 2) && (minor & 1))
                 return -EACCES;
 
+        lock_kernel();
         mtd = get_mtd_device(NULL, devnum);
 
-        if (IS_ERR(mtd))
-                return PTR_ERR(mtd);
+        if (IS_ERR(mtd)) {
+                ret = PTR_ERR(mtd);
+                goto out;
+        }
 
         if (MTD_ABSENT == mtd->type) {
                 put_mtd_device(mtd);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
 
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
-                return -EACCES;
+                ret = -EACCES;
+                goto out;
         }
 
         mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
         if (!mfi) {
                 put_mtd_device(mtd);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         mfi->mtd = mtd;
         file->private_data = mfi;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 } /* mtd_open */
 
 /*====================================================================*/