android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc3: dwc3-omap: return -EPROBE_DEFER if probe has not yet executed

Browse Source 
return -EPROBE_DEFER from dwc3_omap_mailbox in dwc3-omap.c, if the probe of
dwc3-omap has not yet been executed or failed.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Kishon Vijay Abraham I
2013-03-07 18:51:44 +05:30
committed by Felipe Balbi
parent ddff14f1ab
commit 2ba7943af0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/dwc3/dwc3-omap.c
View File

@ -138,11 +138,14 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value)
writel(value, base + offset); 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; u32 val;
struct dwc3_omap *omap = _omap; struct dwc3_omap *omap = _omap;
if (!omap)
return -EPROBE_DEFER;
switch (status) { switch (status) {
case OMAP_DWC3_ID_GROUND: case OMAP_DWC3_ID_GROUND:
dev_dbg(omap->dev, "ID GND\n"); 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"); dev_dbg(omap->dev, "ID float\n");
} }
return; return 0;
} }
EXPORT_SYMBOL_GPL(dwc3_omap_mailbox); EXPORT_SYMBOL_GPL(dwc3_omap_mailbox);

6
include/linux/usb/dwc3-omap.h
View File

@ -19,11 +19,11 @@ enum omap_dwc3_vbus_id_status {
}; };
#if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE)) #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 #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 #endif