From 63bbc0deacebac783c58bd333e1aadfd9f02b351 Mon Sep 17 00:00:00 2001 From: Alexander Chiang Date: Tue, 2 Feb 2010 19:08:40 +0000 Subject: [PATCH] --- yaml --- r: 184952 b: refs/heads/master c: dc2ed5e3c963490a4fe934b482537d1274961ecb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/user_mad.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c953ca4983e4..d264f92922ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d451b8df9f7e572ea77f976745f424dd1dae8aeb +refs/heads/master: dc2ed5e3c963490a4fe934b482537d1274961ecb diff --git a/trunk/drivers/infiniband/core/user_mad.c b/trunk/drivers/infiniband/core/user_mad.c index df403ec49d94..5a66bd062389 100644 --- a/trunk/drivers/infiniband/core/user_mad.c +++ b/trunk/drivers/infiniband/core/user_mad.c @@ -975,6 +975,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, struct ib_umad_port *port) { int devnum; + dev_t base; spin_lock(&port_lock); devnum = find_first_zero_bit(dev_map, IB_UMAD_MAX_PORTS); @@ -983,6 +984,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, return -1; } port->dev_num = devnum; + base = devnum + base_dev; set_bit(devnum, dev_map); spin_unlock(&port_lock); @@ -995,7 +997,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, cdev_init(&port->cdev, &umad_fops); port->cdev.owner = THIS_MODULE; kobject_set_name(&port->cdev.kobj, "umad%d", port->dev_num); - if (cdev_add(&port->cdev, base_dev + devnum, 1)) + if (cdev_add(&port->cdev, base, 1)) goto err_cdev; port->dev = device_create(umad_class, device->dma_device, @@ -1009,10 +1011,11 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, if (device_create_file(port->dev, &dev_attr_port)) goto err_dev; + base += IB_UMAD_MAX_PORTS; cdev_init(&port->sm_cdev, &umad_sm_fops); port->sm_cdev.owner = THIS_MODULE; kobject_set_name(&port->sm_cdev.kobj, "issm%d", port->dev_num); - if (cdev_add(&port->sm_cdev, base_dev + devnum + IB_UMAD_MAX_PORTS, 1)) + if (cdev_add(&port->sm_cdev, base, 1)) goto err_sm_cdev; port->sm_dev = device_create(umad_class, device->dma_device,