Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480390c8 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'mlx4' and 'qib' into for-next

parents 04ded167 4af3ce0d 29d1b161

drivers/infiniband/hw/mlx4/main.c

+4 −2
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 


err_counter:

	for (; i; --i)

		if (ibdev->counters[i - 1] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);



err_map:
@@ -1275,6 +1276,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 
	}

	iounmap(ibdev->uar_map);

	for (p = 0; p < ibdev->num_ports; ++p)

		if (ibdev->counters[p] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[p]);

	mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)

		mlx4_CLOSE_PORT(dev, p);

drivers/infiniband/hw/qib/qib_file_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt, 
	strlcpy(rcd->comm, current->comm, sizeof(rcd->comm));

	ctxt_fp(fp) = rcd;

	qib_stats.sps_ctxts++;

	dd->freectxts++;

	dd->freectxts--;

	ret = 0;

	goto bail;
@@ -1794,7 +1794,7 @@ static int qib_close(struct inode *in, struct file *fp) 
		if (dd->pageshadow)

			unlock_expected_tids(rcd);

		qib_stats.sps_ctxts--;

		dd->freectxts--;

		dd->freectxts++;

	}



	mutex_unlock(&qib_mutex);