[PATCH 2/2] g_hid: unregister platform driver on probe/usb_composite_register errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Otherwise reloads will fail.

Signed-off-by: Peter Korsgaard <peter.korsgaard@xxxxxxxxx>
---
 drivers/usb/gadget/hid.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c
index b77e977..7757226 100644
--- a/drivers/usb/gadget/hid.c
+++ b/drivers/usb/gadget/hid.c
@@ -275,8 +275,18 @@ MODULE_LICENSE("GPL");
 
 static int __init hidg_init(void)
 {
-	platform_driver_probe(&hidg_plat_driver, hidg_plat_driver_probe);
-	return usb_composite_register(&hidg_driver);
+	int status;
+
+	status = platform_driver_probe(&hidg_plat_driver,
+				hidg_plat_driver_probe);
+	if (status < 0)
+		return status;
+
+	status = usb_composite_register(&hidg_driver);
+	if (status < 0)
+		platform_driver_unregister(&hidg_plat_driver);
+
+	return status;
 }
 module_init(hidg_init);
 
-- 
1.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux