aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-21 04:41:22 -0400
committerFelipe Balbi <balbi@ti.com>2013-08-27 16:05:30 -0400
commit0f82768406914d1391ec6d087500db7405f8f68e (patch)
tree09e1bde0078d2e742118f666f5d849bd91df82a1 /drivers/usb
parentdf4989954abc5ae160865bec79b0f099086decce (diff)
usb: phy: signedness bugs in suspend/resume functions
"ret" needs to be signed for the error handling to work. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/phy/phy-omap-usb2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c
index 844ab68f08d0..d266861d24f7 100644
--- a/drivers/usb/phy/phy-omap-usb2.c
+++ b/drivers/usb/phy/phy-omap-usb2.c
@@ -98,8 +98,8 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
98 98
99static int omap_usb2_suspend(struct usb_phy *x, int suspend) 99static int omap_usb2_suspend(struct usb_phy *x, int suspend)
100{ 100{
101 u32 ret;
102 struct omap_usb *phy = phy_to_omapusb(x); 101 struct omap_usb *phy = phy_to_omapusb(x);
102 int ret;
103 103
104 if (suspend && !phy->is_suspended) { 104 if (suspend && !phy->is_suspended) {
105 omap_control_usb_phy_power(phy->control_dev, 0); 105 omap_control_usb_phy_power(phy->control_dev, 0);
@@ -108,8 +108,7 @@ static int omap_usb2_suspend(struct usb_phy *x, int suspend)
108 } else if (!suspend && phy->is_suspended) { 108 } else if (!suspend && phy->is_suspended) {
109 ret = pm_runtime_get_sync(phy->dev); 109 ret = pm_runtime_get_sync(phy->dev);
110 if (ret < 0) { 110 if (ret < 0) {
111 dev_err(phy->dev, "get_sync failed with err %d\n", 111 dev_err(phy->dev, "get_sync failed with err %d\n", ret);
112 ret);
113 return ret; 112 return ret;
114 } 113 }
115 omap_control_usb_phy_power(phy->control_dev, 1); 114 omap_control_usb_phy_power(phy->control_dev, 1);
@@ -209,9 +208,9 @@ static int omap_usb2_runtime_suspend(struct device *dev)
209 208
210static int omap_usb2_runtime_resume(struct device *dev) 209static int omap_usb2_runtime_resume(struct device *dev)
211{ 210{
212 u32 ret = 0;
213 struct platform_device *pdev = to_platform_device(dev); 211 struct platform_device *pdev = to_platform_device(dev);
214 struct omap_usb *phy = platform_get_drvdata(pdev); 212 struct omap_usb *phy = platform_get_drvdata(pdev);
213 int ret;
215 214
216 ret = clk_enable(phy->wkupclk); 215 ret = clk_enable(phy->wkupclk);
217 if (ret < 0) { 216 if (ret < 0) {