diff options
| -rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 4 |
2 files changed, 2 insertions, 4 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 | } |
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 99b3c4ae86eb..d617da9bd351 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
| @@ -2456,10 +2456,8 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, | |||
| 2456 | if ((page_count!=0)&&(page_count<<12)-(region->offset&(4096-1))>=region->length) | 2456 | if ((page_count!=0)&&(page_count<<12)-(region->offset&(4096-1))>=region->length) |
| 2457 | goto enough_pages; | 2457 | goto enough_pages; |
| 2458 | if ((page_count&0x01FF) == 0) { | 2458 | if ((page_count&0x01FF) == 0) { |
| 2459 | if (page_count>(1024*512)) { | 2459 | if (page_count >= 1024 * 512) { |
| 2460 | ib_umem_release(region); | 2460 | ib_umem_release(region); |
| 2461 | pci_free_consistent(nesdev->pcidev, 4096, vpbl.pbl_vbase, | ||
| 2462 | vpbl.pbl_pbase); | ||
| 2463 | nes_free_resource(nesadapter, | 2461 | nes_free_resource(nesadapter, |
| 2464 | nesadapter->allocated_mrs, stag_index); | 2462 | nesadapter->allocated_mrs, stag_index); |
| 2465 | kfree(nesmr); | 2463 | kfree(nesmr); |
