Merge remote branch 'kumar/next' into merge

[linux.git] / drivers / pnp / driver.c

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d1dbb9df53faa7bc7e9b6fe8de8158595188c949..00e94032531a71c121b6a222efa14338e08ff6b3 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -189,8 +189,11 @@ static int pnp_bus_resume(struct device *dev)
        if (!pnp_drv)
                return 0;
 
-       if (pnp_dev->protocol->resume)
-               pnp_dev->protocol->resume(pnp_dev);
+       if (pnp_dev->protocol->resume) {
+               error = pnp_dev->protocol->resume(pnp_dev);
+               if (error)
+                       return error;
+       }
 
        if (pnp_can_write(pnp_dev)) {
                error = pnp_start_dev(pnp_dev);