diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/powerpc/kernel/rtas_flash.c | |
parent | [POWERPC] Remove CONFIG_PCI_LEGACY from some configs (diff) | |
parent | Linux 2.6.25-rc9 (diff) | |
download | linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.xz linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/rtas_flash.c')
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index e1756e112344..627f126d1848 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c @@ -356,7 +356,7 @@ static int rtas_excl_open(struct inode *inode, struct file *file) /* Enforce exclusive open with use count of PDE */ spin_lock(&flash_file_open_lock); - if (atomic_read(&dp->count) > 1) { + if (atomic_read(&dp->count) > 2) { spin_unlock(&flash_file_open_lock); return -EBUSY; } |