From 52e1d28a0c5c3681b07e1409b6a2a7cd19b44453 Mon Sep 17 00:00:00 2001
From: Tatyana Brokhman <tlinder@codeaurora.org>
Date: Wed, 29 Jun 2011 16:41:53 +0300
Subject: [PATCH] --- yaml --- r: 259231 b: refs/heads/master c:
 7eca4c5a8b73f22ad16ad6e76b901351732355da h: refs/heads/master i:   259229:
 df2f3b5538fd159f964f0881bc15f7db6e25bcef   259227:
 a44b5c1cd3bb29424a5162901729ed78ae6ce6f4   259223:
 4ad90b8a3db061c47e77cf644d35ffc5e116fe27   259215:
 c69d8bc34d6cfd4f43cbae4d4942f0a8976e75a5   259199:
 d8610c74128f14f9734ff1a82241ab379463043b v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/dummy_hcd.c | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 72c93a58ba9e..8d3dfc7f753b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cd8fd2887e162ad3d067150962cc3d32dcf3150
+refs/heads/master: 7eca4c5a8b73f22ad16ad6e76b901351732355da
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index a4896df3296c..d040dc406b12 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -72,13 +72,17 @@ MODULE_LICENSE ("GPL");
 
 struct dummy_hcd_module_parameters {
 	bool is_super_speed;
+	bool is_high_speed;
 };
 
 static struct dummy_hcd_module_parameters mod_data = {
-	.is_super_speed = false
+	.is_super_speed = false,
+	.is_high_speed = true,
 };
 module_param_named(is_super_speed, mod_data.is_super_speed, bool, S_IRUGO);
 MODULE_PARM_DESC(is_super_speed, "true to simulate SuperSpeed connection");
+module_param_named(is_high_speed, mod_data.is_high_speed, bool, S_IRUGO);
+MODULE_PARM_DESC(is_high_speed, "true to simulate HighSpeed connection");
 /*-------------------------------------------------------------------------*/
 
 /* gadget side driver data structres */
@@ -909,12 +913,15 @@ static int dummy_udc_start(struct usb_gadget_driver *driver,
 	dum->gadget.ep0 = &dum->ep [0].ep;
 	if (mod_data.is_super_speed)
 		dum->gadget.speed = driver->speed;
+	else if (mod_data.is_high_speed)
+		dum->gadget.speed = min_t(u8, USB_SPEED_HIGH, driver->speed);
 	else
-		dum->gadget.speed = min((u8)USB_SPEED_HIGH, (u8)driver->speed);
+		dum->gadget.speed = USB_SPEED_FULL;
 	if (dum->gadget.speed < driver->speed)
-		dev_dbg(udc_dev(dum), "This device can perform faster if"
-				      " you connect it to a "
-				      "SupeSpeed port...\n");
+		dev_dbg(udc_dev(dum), "This device can perform faster"
+				" if you connect it to a %s port...\n",
+			(driver->speed == USB_SPEED_SUPER ?
+			 "SuperSpeed" : "HighSpeed"));
 
 	if (dum->gadget.speed == USB_SPEED_SUPER) {
 		for (i = 0; i < DUMMY_ENDPOINTS; i++)
@@ -2435,6 +2442,9 @@ static int __init init (void)
 	if (usb_disabled ())
 		return -ENODEV;
 
+	if (!mod_data.is_high_speed && mod_data.is_super_speed)
+		return -EINVAL;
+
 	the_hcd_pdev = platform_device_alloc(driver_name, -1);
 	if (!the_hcd_pdev)
 		return retval;