X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fpnp%2Fdriver.c;h=00e94032531a71c121b6a222efa14338e08ff6b3;hb=ebe0d805071c318ebbc3b5857f8f4f94214c1a52;hp=d1dbb9df53faa7bc7e9b6fe8de8158595188c949;hpb=76db8ac45fc738f7d7664fe9b56d15c594a45228;p=~andy%2Flinux

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d1dbb9df53f..00e94032531 100644
--- 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);