diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
| commit | 50d1e9302bab7d35dae7146f8c468e0943015616 (patch) | |
| tree | fa05320f4a297bd582686574cf94ba444e264b3f /drivers/infiniband/core/ucm.c | |
| parent | crypto: mv_cesa - fixup error handling in mv_probe() (diff) | |
| parent | n2_crypto: Add HMAC support. (diff) | |
| download | linux-dev-50d1e9302bab7d35dae7146f8c468e0943015616.tar.xz linux-dev-50d1e9302bab7d35dae7146f8c468e0943015616.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
Diffstat (limited to 'drivers/infiniband/core/ucm.c')
| -rw-r--r-- | drivers/infiniband/core/ucm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 512b1c43460c..46474842cfe9 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -1181,7 +1181,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp) file->filp = filp; file->device = container_of(inode->i_cdev, struct ib_ucm_device, cdev); - return 0; + return nonseekable_open(inode, filp); } static int ib_ucm_close(struct inode *inode, struct file *filp) @@ -1229,6 +1229,7 @@ static const struct file_operations ucm_fops = { .release = ib_ucm_close, .write = ib_ucm_write, .poll = ib_ucm_poll, + .llseek = no_llseek, }; static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr, |