Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Roland Dreier 2011-12-19 09:19:49 -08:00
commit 480390c8f3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/infiniband/hw/mlx4/main.c
View file

@ -1244,7 +1244,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
err_counter: err_counter:
for (; i; --i) for (; i; --i)
mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]); if (ibdev->counters[i - 1] != -1)
mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);
err_map: err_map:
iounmap(ibdev->uar_map); iounmap(ibdev->uar_map);
@ -1275,7 +1276,8 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
} }
iounmap(ibdev->uar_map); iounmap(ibdev->uar_map);
for (p = 0; p < ibdev->num_ports; ++p) for (p = 0; p < ibdev->num_ports; ++p)
mlx4_counter_free(ibdev->dev, ibdev->counters[p]); if (ibdev->counters[p] != -1)
mlx4_counter_free(ibdev->dev, ibdev->counters[p]);
mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB) mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)
mlx4_CLOSE_PORT(dev, p); mlx4_CLOSE_PORT(dev, p);

4
drivers/infiniband/hw/qib/qib_file_ops.c
View file

@ -1285,7 +1285,7 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt,
strlcpy(rcd->comm, current->comm, sizeof(rcd->comm)); strlcpy(rcd->comm, current->comm, sizeof(rcd->comm));
ctxt_fp(fp) = rcd; ctxt_fp(fp) = rcd;
qib_stats.sps_ctxts++; qib_stats.sps_ctxts++;
dd->freectxts++; dd->freectxts--;
ret = 0; ret = 0;
goto bail; goto bail;
@ -1794,7 +1794,7 @@ static int qib_close(struct inode *in, struct file *fp)
if (dd->pageshadow) if (dd->pageshadow)
unlock_expected_tids(rcd); unlock_expected_tids(rcd);
qib_stats.sps_ctxts--; qib_stats.sps_ctxts--;
dd->freectxts--; dd->freectxts++;
} }
mutex_unlock(&qib_mutex); mutex_unlock(&qib_mutex);