From 0ee065e53b526c7fd6d86e6c13dba4908ed16213 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 6 Nov 2005 15:47:02 -0800 Subject: [PATCH] --- yaml --- r: 13767 b: refs/heads/master c: 8b37b94721533f2729c79bcb6fa0bb3e2bc2f400 h: refs/heads/master i: 13765: 1ab2fa1801d37fc071608ac8053d7c1fbc155b62 13763: e7ab489e6311bb5be1977b1c75747e76c17abad0 13759: 4cbc1fe368e32b3d4cdd1fa0410afe2fb238c02f v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/user_mad.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 12969dc3b4f5..540e1a56148d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f69ce1e4474e5d5e266457e8a1f4166cf71f6c7 +refs/heads/master: 8b37b94721533f2729c79bcb6fa0bb3e2bc2f400 diff --git a/trunk/drivers/infiniband/core/user_mad.c b/trunk/drivers/infiniband/core/user_mad.c index aed5ca23fb22..6aefeed42ab3 100644 --- a/trunk/drivers/infiniband/core/user_mad.c +++ b/trunk/drivers/infiniband/core/user_mad.c @@ -801,7 +801,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, goto err_class; port->sm_dev->owner = THIS_MODULE; port->sm_dev->ops = &umad_sm_fops; - kobject_set_name(&port->dev->kobj, "issm%d", port->dev_num); + kobject_set_name(&port->sm_dev->kobj, "issm%d", port->dev_num); if (cdev_add(port->sm_dev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1)) goto err_sm_cdev; @@ -913,7 +913,7 @@ static void ib_umad_add_one(struct ib_device *device) err: while (--i >= s) - ib_umad_kill_port(&umad_dev->port[i]); + ib_umad_kill_port(&umad_dev->port[i - s]); kref_put(&umad_dev->ref, ib_umad_release_dev); }