diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-07 00:16:37 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-07 00:16:37 +0100 |
| commit | d8254e0e72c8cc6131f789f8645338b719f57648 (patch) | |
| tree | 0189fc5518d6d0d8fb2c909eefaac92e0a7723bd /drivers/pnp | |
| parent | 62c6dae02d4fe2bfa6bc699ae456ff1c50d10bd0 (diff) | |
| download | linux-stable-d8254e0e72c8cc6131f789f8645338b719f57648.tar.gz linux-stable-d8254e0e72c8cc6131f789f8645338b719f57648.tar.bz2 linux-stable-d8254e0e72c8cc6131f789f8645338b719f57648.zip | |
PNPBIOS: check return value of pnp_add_device()
pnp_add_device() may fail so we need to handle errors and avoid leaking
memory.
Also, when pnp_alloc_dev fails, return -ENOMEM rather than -1.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpbios/core.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index 9b86a01af631..074569e77d22 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c @@ -312,18 +312,19 @@ static int __init insert_device(struct pnp_bios_node *node) struct list_head *pos; struct pnp_dev *dev; char id[8]; + int error; /* check if the device is already added */ list_for_each(pos, &pnpbios_protocol.devices) { dev = list_entry(pos, struct pnp_dev, protocol_list); if (dev->number == node->handle) - return -1; + return -EEXIST; } pnp_eisa_id_to_string(node->eisa_id & PNP_EISA_ID_MASK, id); dev = pnp_alloc_dev(&pnpbios_protocol, node->handle, id); if (!dev) - return -1; + return -ENOMEM; pnpbios_parse_data_stream(dev, node); dev->active = pnp_is_active(dev); @@ -342,7 +343,12 @@ static int __init insert_device(struct pnp_bios_node *node) if (!dev->active) pnp_init_resources(dev); - pnp_add_device(dev); + error = pnp_add_device(dev); + if (error) { + put_device(&dev->dev); + return error; + } + pnpbios_interface_attach_device(node); return 0; |