Merge "msm_otg: Fix forbidden compilation warning." into msm-3.0
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index 3c130e9..4658469 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -2144,7 +2144,6 @@
static int msm_otg_pm_resume(struct device *dev)
{
struct msm_otg *motg = dev_get_drvdata(dev);
- int ret = 0;
dev_dbg(dev, "OTG PM resume\n");
@@ -2153,7 +2152,7 @@
* Do not resume hardware as part of system resume,
* rather, wait for the ASYNC INT from the h/w
*/
- return ret;
+ return 0;
#endif
return msm_otg_resume(motg);