Messages in this thread Patch in this message | | | Date | Tue, 25 Mar 2003 22:37:22 +0000 | From | Adam Belay <> | Subject | Re: [PATCH] PnP Changes for 2.5.66 |
| |
# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1001 -> 1.1002 # drivers/pnp/manager.c 1.5 -> 1.6 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/03/25 ambx1@neo.rr.com 1.1002 # Silently Ignore if the device is already active/disabled # # Some drivers will try to activate a device even though it is already # active. Instead of returning an error, the resource manager will now # just ignore this. This should solve some of the recently seen problems. # Also it doesn't make sense to return an error if the device is already # in the correct state. # -------------------------------------------- # diff -Nru a/drivers/pnp/manager.c b/drivers/pnp/manager.c --- a/drivers/pnp/manager.c Tue Mar 25 21:44:41 2003 +++ b/drivers/pnp/manager.c Tue Mar 25 21:44:41 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); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |