From b3675a4f6b250d28344116a800ec8ab1303d4c07 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Tue, 10 Oct 2006 21:11:43 +0200 Subject: [PATCH] --- yaml --- r: 43427 b: refs/heads/master c: 5c37dcbe138ed3239c5e8b6c2626ce773a7cea2e h: refs/heads/master i: 43425: 33e7c58758f5f2dd33331481b4f82f7f669d7200 43423: 2320b56683ddf1d3f37e3c57407333c061ea3ff0 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/hosts.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d531c93f79c6..b1e129640353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63d4fe95f29b6cadffcee8cdabd8435e8560cde +refs/heads/master: 5c37dcbe138ed3239c5e8b6c2626ce773a7cea2e diff --git a/trunk/drivers/ieee1394/hosts.c b/trunk/drivers/ieee1394/hosts.c index b935e08695a9..25573bad81e0 100644 --- a/trunk/drivers/ieee1394/hosts.c +++ b/trunk/drivers/ieee1394/hosts.c @@ -157,10 +157,9 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, h->speed_map = (u8 *)(h->csr.speed_map + 2); mutex_lock(&host_num_alloc); - while (nodemgr_for_each_host(&hostnum, alloc_hostnum_cb)) hostnum++; - + mutex_unlock(&host_num_alloc); h->id = hostnum; memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device)); @@ -175,8 +174,6 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, class_device_register(&h->class_dev); get_device(&h->device); - mutex_unlock(&host_num_alloc); - return h; }