git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFSv4: Don't fail nfs4_xdr_dec_open if decode_restorefh() failed
[pandora-kernel.git]
/
fs
/
char_dev.c
diff --git
a/fs/char_dev.c
b/fs/char_dev.c
index
e6194e2
..
bbbf07b
100644
(file)
--- a/
fs/char_dev.c
+++ b/
fs/char_dev.c
@@
-6,6
+6,7
@@
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/fs.h>
+#include <linux/kdev_t.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/string.h>
@@
-108,13
+109,6
@@
__register_chrdev_region(unsigned int major, unsigned int baseminor,
/* temporary */
if (major == 0) {
for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
/* temporary */
if (major == 0) {
for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
- /*
- * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
- * majors
- */
- if ((60 <= i && i <= 63) || (120 <= i && i <= 127) ||
- (240 <= i && i <= 254))
- continue;
if (chrdevs[i] == NULL)
break;
}
if (chrdevs[i] == NULL)
break;
}
@@
-327,14
+321,13
@@
void unregister_chrdev_region(dev_t from, unsigned count)
}
}
}
}
-
int
unregister_chrdev(unsigned int major, const char *name)
+
void
unregister_chrdev(unsigned int major, const char *name)
{
struct char_device_struct *cd;
cd = __unregister_chrdev_region(major, 0, 256);
if (cd && cd->cdev)
cdev_del(cd->cdev);
kfree(cd);
{
struct char_device_struct *cd;
cd = __unregister_chrdev_region(major, 0, 256);
if (cd && cd->cdev)
cdev_del(cd->cdev);
kfree(cd);
- return 0;
}
static DEFINE_SPINLOCK(cdev_lock);
}
static DEFINE_SPINLOCK(cdev_lock);