diff options
-rw-r--r-- | drivers/usb/dwc3/dwc3-omap.c | 7 | ||||
-rw-r--r-- | include/linux/usb/dwc3-omap.h | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 546f1fd84920..2fe9723ff1df 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c | |||
@@ -138,11 +138,14 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value) | |||
138 | writel(value, base + offset); | 138 | writel(value, base + offset); |
139 | } | 139 | } |
140 | 140 | ||
141 | void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) | 141 | int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) |
142 | { | 142 | { |
143 | u32 val; | 143 | u32 val; |
144 | struct dwc3_omap *omap = _omap; | 144 | struct dwc3_omap *omap = _omap; |
145 | 145 | ||
146 | if (!omap) | ||
147 | return -EPROBE_DEFER; | ||
148 | |||
146 | switch (status) { | 149 | switch (status) { |
147 | case OMAP_DWC3_ID_GROUND: | 150 | case OMAP_DWC3_ID_GROUND: |
148 | dev_dbg(omap->dev, "ID GND\n"); | 151 | dev_dbg(omap->dev, "ID GND\n"); |
@@ -185,7 +188,7 @@ void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) | |||
185 | dev_dbg(omap->dev, "ID float\n"); | 188 | dev_dbg(omap->dev, "ID float\n"); |
186 | } | 189 | } |
187 | 190 | ||
188 | return; | 191 | return 0; |
189 | } | 192 | } |
190 | EXPORT_SYMBOL_GPL(dwc3_omap_mailbox); | 193 | EXPORT_SYMBOL_GPL(dwc3_omap_mailbox); |
191 | 194 | ||
diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h index 51eae14477f7..5615f4d82724 100644 --- a/include/linux/usb/dwc3-omap.h +++ b/include/linux/usb/dwc3-omap.h | |||
@@ -19,11 +19,11 @@ enum omap_dwc3_vbus_id_status { | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | #if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE)) | 21 | #if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE)) |
22 | extern void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status); | 22 | extern int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status); |
23 | #else | 23 | #else |
24 | static inline void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) | 24 | static inline int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status) |
25 | { | 25 | { |
26 | return; | 26 | return -ENODEV; |
27 | } | 27 | } |
28 | #endif | 28 | #endif |
29 | 29 | ||