From f32ce9a1b2081464a37ac489a2bbc889def2fd15 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 16 Jun 2011 13:16:38 -0700 Subject: [PATCH] --- yaml --- r: 259710 b: refs/heads/master c: 91fd799eb12bd43b3dfda368abb06d2a7d864462 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9b6f8221a70..2e04679019c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9079ce691255792009c446d8c3382507b8d38635 +refs/heads/master: 91fd799eb12bd43b3dfda368abb06d2a7d864462 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index be158be28ee3..1c949f5fb716 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -788,7 +788,10 @@ static int __init hv_acpi_init(void) return -ENODEV; } - return vmbus_bus_init(irq); + ret = vmbus_bus_init(irq); + if (ret) + acpi_bus_unregister_driver(&vmbus_acpi_driver); + return ret; }