diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /fs/pipe.c | |
parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -863,6 +863,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) | |||
863 | { | 863 | { |
864 | int ret = -ENOENT; | 864 | int ret = -ENOENT; |
865 | 865 | ||
866 | if (!(filp->f_mode & (FMODE_READ|FMODE_WRITE))) | ||
867 | return -EINVAL; | ||
868 | |||
866 | mutex_lock(&inode->i_mutex); | 869 | mutex_lock(&inode->i_mutex); |
867 | 870 | ||
868 | if (inode->i_pipe) { | 871 | if (inode->i_pipe) { |