From c5b0c1dbe6c6bfc81b0dd5ca944d626b6d6362a1 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 10 Oct 2011 22:01:15 -0700
Subject: [PATCH] --- yaml --- r: 265087 b: refs/heads/master c:
 651f5e49dd3d369711bd622f4bc72c2fa30a3cf9 h: refs/heads/master i:   265085:
 51c42e9f221ec214977c30a222cd01d17cbcf68c   265083:
 5290786f3e2205cc576d86c0da983777bb76b759   265079:
 4e1e0137eceed3e78db729666a548ac7172f904a   265071:
 edd2310dc762f9eb698d094cc5a1c7a1b81f2df3   265055:
 a6cacfe648df232e143c7d5453723208c0d6679d   265023:
 1677786d77c0761d744681fad0f9c60daee5c51d   264959:
 5257f8786329dfe53e308ed673541240d4b064f7 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/usb/renesas_usbhs/mod.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8684e7b8d84e..04c6a32684ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c6ef985ced753b60ecdc091fa49c3f5fa4a4f79
+refs/heads/master: 651f5e49dd3d369711bd622f4bc72c2fa30a3cf9
diff --git a/trunk/drivers/usb/renesas_usbhs/mod.c b/trunk/drivers/usb/renesas_usbhs/mod.c
index 621f6cc50db6..74ef49e7dd5f 100644
--- a/trunk/drivers/usb/renesas_usbhs/mod.c
+++ b/trunk/drivers/usb/renesas_usbhs/mod.c
@@ -292,6 +292,14 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod)
 	u16 intenb0 = 0;
 	struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
 
+	/*
+	 * BEMPENB/BRDYENB are picky.
+	 * below method is required
+	 *
+	 *  - clear  INTSTS0
+	 *  - update BEMPENB/BRDYENB
+	 *  - update INTSTS0
+	 */
 	usbhs_write(priv, INTENB0, 0);
 
 	usbhs_write(priv, BEMPENB, 0);
@@ -324,5 +332,6 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod)
 		}
 	}
 
-	usbhs_write(priv, INTENB0, intenb0);
+	if (intenb0)
+		usbhs_write(priv, INTENB0, intenb0);
 }