Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index e82aac9cc2f5b9d39101e372cdab81dd971725a0..a69a5d8a406f982be7eb6cb1fc9c4ff59a858ffa 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -150,7 +150,7 @@ __unregister_chrdev_region(unsigned major, unsigned baseminor, int minorct)
        struct char_device_struct *cd = NULL, **cp;
        int i = major_to_index(major);
 
-       up(&chrdevs_lock);
+       down(&chrdevs_lock);
        for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next)
                if ((*cp)->major == major &&
                    (*cp)->baseminor == baseminor &&