diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 19:08:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 19:08:59 -0400 |
| commit | f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295 (patch) | |
| tree | 8d6d56189526b50041abaef8aa308d0e72aca91a /drivers/infiniband/core/uverbs_main.c | |
| parent | a8051fde6b71ac9a0e63c861c81c59ba776175f9 (diff) | |
| parent | fb77bcef9f7be78e3e11543cb5abbcb1b1fac53e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path
Diffstat (limited to 'drivers/infiniband/core/uverbs_main.c')
| -rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index f806da184b51..caed42bf7ef5 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -423,7 +423,7 @@ static void ib_uverbs_async_handler(struct ib_uverbs_file *file, | |||
| 423 | unsigned long flags; | 423 | unsigned long flags; |
| 424 | 424 | ||
| 425 | spin_lock_irqsave(&file->async_file->lock, flags); | 425 | spin_lock_irqsave(&file->async_file->lock, flags); |
| 426 | if (!file->async_file->is_closed) { | 426 | if (file->async_file->is_closed) { |
| 427 | spin_unlock_irqrestore(&file->async_file->lock, flags); | 427 | spin_unlock_irqrestore(&file->async_file->lock, flags); |
| 428 | return; | 428 | return; |
| 429 | } | 429 | } |