---

yaml --- r: 7954 b: refs/heads/master c: 9d233d9 h: refs/heads/master v: v3
git-mirror · Sep 8, 2005 · 960b383 · 960b383
1 parent c7cac62
commit 960b383
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 165c0f39390212d7a517b80c3bb61cb8f1782fef
+refs/heads/master: 9d233d9faedfd8a4ee22288c1fdc698a6f75db21
diff --git a/trunk/drivers/usb/host/isp116x-hcd.c b/trunk/drivers/usb/host/isp116x-hcd.c
@@ -1585,6 +1585,8 @@ static int isp116x_start(struct usb_hcd *hcd)
 	   be always set. Yet, instead, we request individual port
 	   power switching. */
 	val |= RH_A_PSM;
+	/* Report overcurrent per port */
+	val |= RH_A_OCPM;
 	isp116x_write_reg32(isp116x, HCRHDESCA, val);
 	isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);
 

diff --git a/trunk/include/linux/usb_isp116x.h b/trunk/include/linux/usb_isp116x.h
@@ -7,7 +7,7 @@
 struct isp116x_platform_data {
 	/* Enable internal resistors on downstream ports */
 	unsigned sel15Kres:1;
-	/* On-chip overcurrent protection */
+	/* On-chip overcurrent detection */
 	unsigned oc_enable:1;
 	/* INT output polarity */
 	unsigned int_act_high:1;