diff options
| author | Linus Torvalds <torvalds@linuxfoundation.org> | 2007-11-23 15:35:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linuxfoundation.org> | 2007-11-23 15:35:26 -0500 |
| commit | f68565831e7269e49b20f201ddef99f136a8c348 (patch) | |
| tree | 0e05cc22e5f1fea08113fd08549bf1e875abce9a /fs/devices.c | |
| parent | bdd9c8e5286db0c47362e34a29fa1343fa83a4a6 (diff) | |
| download | tip-f68565831e72.tar.gz | |
Import 2.4.0-test2pre3
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
Diffstat (limited to 'fs/devices.c')
| -rw-r--r-- | fs/devices.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/devices.c b/fs/devices.c index 2c53934b90010c..d119b1c75f620e 100644 --- a/fs/devices.c +++ b/fs/devices.c @@ -17,6 +17,7 @@ #include <linux/stat.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/module.h> #ifdef CONFIG_KMOD #include <linux/kmod.h> @@ -142,8 +143,9 @@ int chrdev_open(struct inode * inode, struct file * filp) { int ret = -ENODEV; - filp->f_op = get_chrfops(MAJOR(inode->i_rdev), MINOR(inode->i_rdev)); - if (filp->f_op != NULL){ + filp->f_op = fops_get(get_chrfops(MAJOR(inode->i_rdev), + MINOR(inode->i_rdev))); + if (filp->f_op) { ret = 0; if (filp->f_op->open != NULL) ret = filp->f_op->open(inode,filp); |