[PATCH 2/2] PNPACPI: check return value of pnp_add_device()

Dmitry Torokhov
2010-06-05T02:24:13Z

pnp_add_device() may fail so we need to ihandle errors and avoid leaking
memory. Also, do not use ACPI-specific return codes (AE_OK) but rather
standard ones.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

drivers/pnp/pnpacpi/core.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 2029cb5..8c5142d 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -171,8 +171,9 @@ static char *pnpacpi_get_id(struct acpi_device *device)

static int __init pnpacpi_add_device(struct acpi_device *device)
{
- acpi_handle temp = NULL;
+ acpi_handle temp;
acpi_status status;
+ int error;
struct pnp_dev *dev;
char *pnpid;
struct acpi_hardware_id *id;
@@ -233,10 +234,16 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
/* clear out the damaged flags */
if (!dev->active)
pnp_init_resources(dev);
- pnp_add_device(dev);
+
+ error = pnp_add_device(dev);
+ if (error) {
+ put_device(&dev->dev);
+ return error;
+ }
+
num++;

- return AE_OK;
+ return 0;
}

static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,