diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/isdn/capi/capifs.c | |
| parent | [ACPI] remove "Resource isn't an IRQ" warning (diff) | |
| parent | [ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff) | |
| download | linux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip | |
Pull release into acpica branch
Diffstat (limited to 'drivers/isdn/capi/capifs.c')
| -rw-r--r-- | drivers/isdn/capi/capifs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index 7b564c0dd996..0a37aded4b54 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c @@ -17,6 +17,8 @@ #include <linux/ctype.h> #include <linux/sched.h> /* current */ +#include "capifs.h" + MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); @@ -136,7 +138,7 @@ static struct dentry *get_node(int num) { char s[10]; struct dentry *root = capifs_root; - down(&root->d_inode->i_sem); + mutex_lock(&root->d_inode->i_mutex); return lookup_one_len(s, root, sprintf(s, "%d", num)); } @@ -157,7 +159,7 @@ void capifs_new_ncci(unsigned int number, dev_t device) dentry = get_node(number); if (!IS_ERR(dentry) && !dentry->d_inode) d_instantiate(dentry, inode); - up(&capifs_root->d_inode->i_sem); + mutex_unlock(&capifs_root->d_inode->i_mutex); } void capifs_free_ncci(unsigned int number) @@ -173,7 +175,7 @@ void capifs_free_ncci(unsigned int number) } dput(dentry); } - up(&capifs_root->d_inode->i_sem); + mutex_unlock(&capifs_root->d_inode->i_mutex); } static int __init capifs_init(void) |