Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 5091b353883ba3358998797efb284f82344531f3

Authored by Roland Dreier
4 parents ae2d9293d7 3e340c05c0 7bd912998e eadde3a1a5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus

Showing 3 changed files Side-by-side Diff

drivers/infiniband/core/cm.c
Diff comments   View file @ 5091b35
... ... @@ -3693,7 +3693,7 @@
3693 3693 cm_dev->device = device_create(&cm_class, &ib_device->dev,
3694 3694 MKDEV(0, 0), NULL,
3695 3695 "%s", ib_device->name);
3696   - if (!cm_dev->device) {
  3696 + if (IS_ERR(cm_dev->device)) {
3697 3697 kfree(cm_dev);
3698 3698 return;
3699 3699 }
drivers/infiniband/hw/mlx4/mr.c
Diff comments   View file @ 5091b35
... ... @@ -238,7 +238,7 @@
238 238 mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev,
239 239 size, &mfrpl->map,
240 240 GFP_KERNEL);
241   - if (!mfrpl->ibfrpl.page_list)
  241 + if (!mfrpl->mapped_page_list)
242 242 goto err_free;
243 243  
244 244 WARN_ON(mfrpl->map & 0x3f);
drivers/infiniband/hw/nes/nes_verbs.c
Diff comments   View file @ 5091b35
... ... @@ -2820,11 +2820,10 @@
2820 2820 attr->cap.max_send_wr = nesqp->hwqp.sq_size;
2821 2821 attr->cap.max_recv_wr = nesqp->hwqp.rq_size;
2822 2822 attr->cap.max_recv_sge = 1;
2823   - if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
2824   - init_attr->cap.max_inline_data = 0;
2825   - } else {
2826   - init_attr->cap.max_inline_data = 64;
2827   - }
  2823 + if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA)
  2824 + attr->cap.max_inline_data = 0;
  2825 + else
  2826 + attr->cap.max_inline_data = 64;
2828 2827  
2829 2828 init_attr->event_handler = nesqp->ibqp.event_handler;
2830 2829 init_attr->qp_context = nesqp->ibqp.qp_context;