---

yaml --- r: 364757 b: refs/heads/master c: ca4f70c h: refs/heads/master i: 364755: efaa2f9 v: v3
git-mirror · Mar 21, 2013 · 2cf9112 · 2cf9112
1 parent 51fbcc2
commit 2cf9112
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44a50d088aad18a1a2709091bf25a108f967f8c9
+refs/heads/master: ca4f70ce78de9a2fa09741f80cf7bda2f4256ecc
diff --git a/trunk/drivers/usb/phy/phy-twl4030-usb.c b/trunk/drivers/usb/phy/phy-twl4030-usb.c
@@ -483,9 +483,10 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
 {
 	struct twl4030_usb *twl = _twl;
 	enum omap_musb_vbus_id_status status;
+	enum omap_musb_vbus_id_status status_prev = twl->linkstat;
 
 	status = twl4030_usb_linkstat(twl);
-	if (status > 0) {
+	if (status > 0 && status != status_prev) {
 		/* FIXME add a set_power() method so that B-devices can
 		 * configure the charger appropriately.  It's not always
 		 * correct to consume VBUS power, and how much current to
@@ -523,7 +524,7 @@ static int twl4030_usb_phy_init(struct usb_phy *phy)
 	twl->asleep = 1;
 
 	status = twl4030_usb_linkstat(twl);
-	if (status > 0)
+	if (status == OMAP_MUSB_ID_GROUND || status == OMAP_MUSB_VBUS_VALID)
 		omap_musb_mailbox(twl->linkstat);
 
 	sysfs_notify(&twl->dev->kobj, NULL, "vbus");