From: Rob Herring <rob.herring@linaro.org>
Date: Tue, 5 May 2015 16:04:22 +0000 (-0500)
Subject: greybus: es2: fix driver name collision with es1
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1563
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c13c8bf0cccd6a9daf8ea02919aecaa45c842fc7;p=karo-tx-linux.git

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 <rob.herring@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

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,