pcmcia: make use of pcmcia_dev_resume() return value
authorDominik Brodowski <linux@dominikbrodowski.net>
Tue, 29 Dec 2009 17:21:39 +0000 (18:21 +0100)
committerDominik Brodowski <linux@dominikbrodowski.net>
Sun, 17 Jan 2010 17:30:05 +0000 (18:30 +0100)
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>
drivers/pcmcia/ds.c

index 1a4a3c49cc15c71fe9db9ab07f61fd4cdff194ad..defa44c27b97241a1f120b3dd0e817ad2a11147c 100644 (file)
@@ -970,13 +970,14 @@ static int runtime_suspend(struct device *dev)
        return rc;
 }
 
-static void runtime_resume(struct device *dev)
+static int runtime_resume(struct device *dev)
 {
        int rc;
 
        down(&dev->sem);
        rc = pcmcia_dev_resume(dev);
        up(&dev->sem);
+       return rc;
 }
 
 /************************ 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))
                ret = runtime_suspend(dev);
        else if (p_dev->suspended && !strncmp(buf, "on", 2))
-               runtime_resume(dev);
+               ret = runtime_resume(dev);
 
        return ret ? ret : count;
 }