From 5f55ac5ea888b8ac486d33e667fa679b74e49256 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 6 Feb 2008 01:40:02 -0800 Subject: [PATCH] --- yaml --- r: 83606 b: refs/heads/master c: cc8259a6666de456460bacdd5637f5e2d71790ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/manager.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 93d56a9e3273..504623761984 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ed3003c19a96fe18edf8179c4be6fe14abbebbc +refs/heads/master: cc8259a6666de456460bacdd5637f5e2d71790ea diff --git a/trunk/drivers/pnp/manager.c b/trunk/drivers/pnp/manager.c index c6b3d4e63ccc..6f8f8ed95c67 100644 --- a/trunk/drivers/pnp/manager.c +++ b/trunk/drivers/pnp/manager.c @@ -513,7 +513,7 @@ int pnp_activate_dev(struct pnp_dev *dev) int error; if (dev->active) - return 0; /* the device is already active */ + return 0; /* ensure resources are allocated */ if (pnp_auto_config_dev(dev)) @@ -524,7 +524,7 @@ int pnp_activate_dev(struct pnp_dev *dev) return error; dev->active = 1; - return 1; + return 0; } /** @@ -538,7 +538,7 @@ int pnp_disable_dev(struct pnp_dev *dev) int error; if (!dev->active) - return 0; /* the device is already disabled */ + return 0; error = pnp_stop_dev(dev); if (error) @@ -551,7 +551,7 @@ int pnp_disable_dev(struct pnp_dev *dev) pnp_clean_resource_table(&dev->res); up(&pnp_res_mutex); - return 1; + return 0; } /**