From 7ea9d086bc028011236127f56e28c54a4a88a0eb Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 16 May 2012 14:11:15 +0200 Subject: [PATCH] --- yaml --- r: 303962 b: refs/heads/master c: ea79c2ed6ec374347e4c61755bcb6fe8c2b24961 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/usb.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9b5600b2f646..aa54bdc971bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4083ea5a78d242761507bf61f7e57c7e85b8bd3 +refs/heads/master: ea79c2ed6ec374347e4c61755bcb6fe8c2b24961 diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c index 7998a67503c1..25d0c61c3f8a 100644 --- a/trunk/drivers/usb/core/usb.c +++ b/trunk/drivers/usb/core/usb.c @@ -1015,9 +1015,7 @@ static int __init usb_init(void) if (retval) goto out; - retval = usb_acpi_register(); - if (retval) - goto acpi_register_failed; + usb_acpi_register(); retval = bus_register(&usb_bus_type); if (retval) goto bus_register_failed; @@ -1053,7 +1051,6 @@ static int __init usb_init(void) bus_unregister(&usb_bus_type); bus_register_failed: usb_acpi_unregister(); -acpi_register_failed: usb_debugfs_cleanup(); out: return retval;