xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'chelsio', 'debug-cleanup', 'hns' and 'i40iw' into merge-test

Browse Source
This commit is contained in:
Doug Ledford
2016-12-14 14:43:14 -05:00
parent 15f7e3c21b f73a1dbc45 4d4099584c d6f7bbcc2e
commit 884fa4f304
77 changed files with 3153 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/hw/cxgb4/device.c
View File

@@ -843,8 +843,6 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
if (rdev->wr_log) {
rdev->wr_log_size = 1 << c4iw_wr_log_size_order;
atomic_set(&rdev->wr_log_idx, 0);
} else {
pr_err(MOD "error allocating wr_log. Logging disabled\n");
}
}
@@ -1426,8 +1424,6 @@ static void recover_queues(struct uld_ctx *ctx)
qp_list.qps = kzalloc(count * sizeof *qp_list.qps, GFP_ATOMIC);
if (!qp_list.qps) {
printk(KERN_ERR MOD "%s: Fatal error - DB overflow recovery failed\n",
pci_name(ctx->lldi.pdev));
spin_unlock_irq(&ctx->dev->lock);
return;
}