diff options
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 582318f10222..270fb7f64d75 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
| @@ -537,18 +537,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj, | |||
| 537 | DPRINT_DBG(VMBUS_DRV, "child device (%p) registering", | 537 | DPRINT_DBG(VMBUS_DRV, "child device (%p) registering", |
| 538 | child_device_ctx); | 538 | child_device_ctx); |
| 539 | 539 | ||
| 540 | /* Make sure we are not registered already */ | 540 | /* Set the device name. Otherwise, device_register() will fail. */ |
| 541 | if (strlen(dev_name(&child_device_ctx->device)) != 0) { | ||
| 542 | DPRINT_ERR(VMBUS_DRV, | ||
| 543 | "child device (%p) already registered - busid %s", | ||
| 544 | child_device_ctx, | ||
| 545 | dev_name(&child_device_ctx->device)); | ||
| 546 | |||
| 547 | ret = -1; | ||
| 548 | goto Cleanup; | ||
| 549 | } | ||
| 550 | |||
| 551 | /* Set the device bus id. Otherwise, device_register()will fail. */ | ||
| 552 | dev_set_name(&child_device_ctx->device, "vmbus_0_%d", | 541 | dev_set_name(&child_device_ctx->device, "vmbus_0_%d", |
| 553 | atomic_inc_return(&device_num)); | 542 | atomic_inc_return(&device_num)); |
| 554 | 543 | ||
| @@ -573,7 +562,6 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj, | |||
| 573 | DPRINT_INFO(VMBUS_DRV, "child device (%p) registered", | 562 | DPRINT_INFO(VMBUS_DRV, "child device (%p) registered", |
| 574 | &child_device_ctx->device); | 563 | &child_device_ctx->device); |
| 575 | 564 | ||
| 576 | Cleanup: | ||
| 577 | DPRINT_EXIT(VMBUS_DRV); | 565 | DPRINT_EXIT(VMBUS_DRV); |
| 578 | 566 | ||
| 579 | return ret; | 567 | return ret; |
