raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

usbnet: smsc95xx: fix suspend failure

Browse Source 
commit 7643721471 upstream.

The three below functions:

	smsc95xx_enter_suspend0()
	smsc95xx_enter_suspend1()
	smsc95xx_enter_suspend2()

return > 0 in case of success, so they will cause smsc95xx_suspend()
to return > 0 and cause suspend failure.

The bug is introduced in commit 3b9f7d(smsc95xx: fix error handling
in suspend failure case).

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Lei
2013-02-22 03:05:03 +00:00
committed by Greg Kroah-Hartman
parent d79ba09797
commit 53be86cb15
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/usb/smsc95xx.c
View File

@@ -1340,6 +1340,8 @@ static int smsc95xx_enter_suspend0(struct usbnet *dev)
ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val); ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
if (ret < 0) if (ret < 0)
netdev_warn(dev->net, "Error reading PM_CTRL\n"); netdev_warn(dev->net, "Error reading PM_CTRL\n");
else
ret = 0;
return ret; return ret;
} }
@@ -1392,6 +1394,8 @@ static int smsc95xx_enter_suspend1(struct usbnet *dev)
ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val); ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
if (ret < 0) if (ret < 0)
netdev_warn(dev->net, "Error writing PM_CTRL\n"); netdev_warn(dev->net, "Error writing PM_CTRL\n");
else
ret = 0;
return ret; return ret;
} }
@@ -1413,6 +1417,8 @@ static int smsc95xx_enter_suspend2(struct usbnet *dev)
ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val); ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
if (ret < 0) if (ret < 0)
netdev_warn(dev->net, "Error writing PM_CTRL\n"); netdev_warn(dev->net, "Error writing PM_CTRL\n");
else
ret = 0;
return ret; return ret;
} }