From c13c8bf0cccd6a9daf8ea02919aecaa45c842fc7 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 5 May 2015 11:04:22 -0500 Subject: [PATCH] greybus: es2: fix driver name collision with es1 Both ES1 and ES2 drivers cannot be loaded due to a driver name conflict. Give ES2 driver the correct name. Signed-off-by: Rob Herring Reviewed-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/es2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c index efdd48d9df8f..cc73fbd9b77b 100644 --- a/drivers/staging/greybus/es2.c +++ b/drivers/staging/greybus/es2.c @@ -686,7 +686,7 @@ error: } static struct usb_driver es1_ap_driver = { - .name = "es1_ap_driver", + .name = "es2_ap_driver", .probe = ap_probe, .disconnect = ap_disconnect, .id_table = id_table, -- 2.39.2