Re: [PATCH] PnP Changes for 2.5.66

Adam Belay
2003-04-04T04:56:39Z

diff -Nru a/drivers/pnp/manager.c b/drivers/pnp/manager.c
--- a/drivers/pnp/manager.c Thu Apr 3 23:40:57 2003
+++ b/drivers/pnp/manager.c Thu Apr 3 23:40:57 2003
@@ -632,8 +632,7 @@
if (!dev)
return -EINVAL;
if (dev->active) {
- pnp_info("res: The PnP device '%s' is already active.", dev->dev.bus_id);
- return -EBUSY;
+ return 0; /* the device is already active */
}
/* If this condition is true, advanced configuration failed, we need to get this device up and running
* so we use the simple config engine which ignores cold conflicts, this of course may lead to new failures */
@@ -698,8 +697,7 @@
if (!dev)
return -EINVAL;
if (!dev->active) {
- pnp_info("res: The PnP device '%s' is already disabled.", dev->dev.bus_id);
- return -EINVAL;
+ return 0; /* the device is already disabled */
}
if (dev->status != PNP_READY){
pnp_info("res: Disable failed becuase the PnP device '%s' is busy.", dev->dev.bus_id);