Merge patch series "Putting some basic order on isa extension lists"

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

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index c02e7bf643a6bc06f37d98e0f9eb727b0232948f..46c534f6b1c974c32379c3089e325439c4316847 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -182,7 +182,8 @@ static int __pnp_bus_suspend(struct device *dev, pm_message_t state)
                        return error;
        }
 
-       if (pnp_can_disable(pnp_dev)) {
+       /* can_write is necessary to be able to re-start the device on resume */
+       if (pnp_can_disable(pnp_dev) && pnp_can_write(pnp_dev)) {
                error = pnp_stop_dev(pnp_dev);
                if (error)
                        return error;