From 530125beb0f8e7d1e61ef1fec72ed3428c07b9e5 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Thu, 7 Mar 2013 18:51:44 +0530
Subject: [PATCH] --- yaml --- r: 364715 b: refs/heads/master c:
 2ba7943af0f0cca5a069cd3aff807815bc76fff1 h: refs/heads/master i:   364713:
 d65bfeed5a44782a63fffa0410b4da508eb7c603   364711:
 4565663b24eb64250dc536391c4007578d5f09bf v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/dwc3/dwc3-omap.c  | 7 +++++--
 trunk/include/linux/usb/dwc3-omap.h | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 70245dc5978a..76be856ea25d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddff14f1ab9b55b73ba59126ef4a10966725fc9d
+refs/heads/master: 2ba7943af0f0cca5a069cd3aff807815bc76fff1
diff --git a/trunk/drivers/usb/dwc3/dwc3-omap.c b/trunk/drivers/usb/dwc3/dwc3-omap.c
index 546f1fd84920..2fe9723ff1df 100644
--- a/trunk/drivers/usb/dwc3/dwc3-omap.c
+++ b/trunk/drivers/usb/dwc3/dwc3-omap.c
@@ -138,11 +138,14 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value)
 	writel(value, base + offset);
 }
 
-void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
+int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
 {
 	u32			val;
 	struct dwc3_omap	*omap = _omap;
 
+	if (!omap)
+		return -EPROBE_DEFER;
+
 	switch (status) {
 	case OMAP_DWC3_ID_GROUND:
 		dev_dbg(omap->dev, "ID GND\n");
@@ -185,7 +188,7 @@ void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
 		dev_dbg(omap->dev, "ID float\n");
 	}
 
-	return;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(dwc3_omap_mailbox);
 
diff --git a/trunk/include/linux/usb/dwc3-omap.h b/trunk/include/linux/usb/dwc3-omap.h
index 51eae14477f7..5615f4d82724 100644
--- a/trunk/include/linux/usb/dwc3-omap.h
+++ b/trunk/include/linux/usb/dwc3-omap.h
@@ -19,11 +19,11 @@ enum omap_dwc3_vbus_id_status {
 };
 
 #if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE))
-extern void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status);
+extern int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status);
 #else
-static inline void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
+static inline int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
 {
-	return;
+	return -ENODEV;
 }
 #endif