diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/powerpc/kernel/rtas_flash.c | |
parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) |
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) | |||
356 | 356 | ||
357 | /* Enforce exclusive open with use count of PDE */ | 357 | /* Enforce exclusive open with use count of PDE */ |
358 | spin_lock(&flash_file_open_lock); | 358 | spin_lock(&flash_file_open_lock); |
359 | if (atomic_read(&dp->count) > 1) { | 359 | if (atomic_read(&dp->count) > 2) { |
360 | spin_unlock(&flash_file_open_lock); | 360 | spin_unlock(&flash_file_open_lock); |
361 | return -EBUSY; | 361 | return -EBUSY; |
362 | } | 362 | } |