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
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
fs
/
fifo.c
diff --git
a/fs/fifo.c
b/fs/fifo.c
index
4e303c2
..
b1a524d
100644
(file)
--- a/
fs/fifo.c
+++ b/
fs/fifo.c
@@
-66,8
+66,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
/* suppress POLLHUP until we have
* seen a writer */
filp->f_version = pipe->w_counter;
/* suppress POLLHUP until we have
* seen a writer */
filp->f_version = pipe->w_counter;
- } else
- {
+ } else {
wait_for_partner(inode, &pipe->w_counter);
if(signal_pending(current))
goto err_rd;
wait_for_partner(inode, &pipe->w_counter);
if(signal_pending(current))
goto err_rd;