diff options
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index c6b3d4e63ccc..6f8f8ed95c67 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
@@ -513,7 +513,7 @@ int pnp_activate_dev(struct pnp_dev *dev) | |||
513 | int error; | 513 | int error; |
514 | 514 | ||
515 | if (dev->active) | 515 | if (dev->active) |
516 | return 0; /* the device is already active */ | 516 | return 0; |
517 | 517 | ||
518 | /* ensure resources are allocated */ | 518 | /* ensure resources are allocated */ |
519 | if (pnp_auto_config_dev(dev)) | 519 | if (pnp_auto_config_dev(dev)) |
@@ -524,7 +524,7 @@ int pnp_activate_dev(struct pnp_dev *dev) | |||
524 | return error; | 524 | return error; |
525 | 525 | ||
526 | dev->active = 1; | 526 | dev->active = 1; |
527 | return 1; | 527 | return 0; |
528 | } | 528 | } |
529 | 529 | ||
530 | /** | 530 | /** |
@@ -538,7 +538,7 @@ int pnp_disable_dev(struct pnp_dev *dev) | |||
538 | int error; | 538 | int error; |
539 | 539 | ||
540 | if (!dev->active) | 540 | if (!dev->active) |
541 | return 0; /* the device is already disabled */ | 541 | return 0; |
542 | 542 | ||
543 | error = pnp_stop_dev(dev); | 543 | error = pnp_stop_dev(dev); |
544 | if (error) | 544 | if (error) |
@@ -551,7 +551,7 @@ int pnp_disable_dev(struct pnp_dev *dev) | |||
551 | pnp_clean_resource_table(&dev->res); | 551 | pnp_clean_resource_table(&dev->res); |
552 | up(&pnp_res_mutex); | 552 | up(&pnp_res_mutex); |
553 | 553 | ||
554 | return 1; | 554 | return 0; |
555 | } | 555 | } |
556 | 556 | ||
557 | /** | 557 | /** |