Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba7943a authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

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



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: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent ddff14f1

drivers/usb/dwc3/dwc3-omap.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/usb/dwc3-omap.h

+3 −3
Original line number Diff line number Diff line
@@ -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