iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pcmcia: make use of pcmcia_dev_resume() return value

Browse Source 
In runtime_resume(), do not throw away the return value of
pcmcia_dev_resume(), for we can use it (at least) in
pcmcia_store_pm_state(). This also fixes the pointless assignment
previosly seen there, as noted by Dan Carpenter.

CC: Dan Carpenter <error27@gmail.com>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2009-12-29 18:21:39 +01:00
parent 9ddabb6700
commit 933a838aa1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pcmcia/ds.c
View File

@ -970,13 +970,14 @@ static int runtime_suspend(struct device *dev)
return rc; return rc;
} }
static void runtime_resume(struct device *dev) static int runtime_resume(struct device *dev)
{ {
int rc; int rc;
down(&dev->sem); down(&dev->sem);
rc = pcmcia_dev_resume(dev); rc = pcmcia_dev_resume(dev);
up(&dev->sem); up(&dev->sem);
return rc;
} }
/************************ per-device sysfs output ***************************/ /************************ per-device sysfs output ***************************/
@ -1027,7 +1028,7 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
if ((!p_dev->suspended) && !strncmp(buf, "off", 3)) if ((!p_dev->suspended) && !strncmp(buf, "off", 3))
ret = runtime_suspend(dev); ret = runtime_suspend(dev);
else if (p_dev->suspended && !strncmp(buf, "on", 2)) else if (p_dev->suspended && !strncmp(buf, "on", 2))
runtime_resume(dev); ret = runtime_resume(dev);
return ret ? ret : count; return ret ? ret : count;
} }