diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:48:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:48:18 +0100 |
| commit | a759012e5f9717a69c2c2f03d6c7fe435e150824 (patch) | |
| tree | 4b44266e68b2047fd676201bea70f6de39a647b3 /drivers/pnp/pnpbios/core.c | |
| parent | bcc7201a91176f815f48f8ad889a20c5c829d9a9 (diff) | |
| parent | d8254e0e72c8cc6131f789f8645338b719f57648 (diff) | |
| download | linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.tar.bz2 | |
Merge branch 'pnp'
* pnp:
PNPBIOS: check return value of pnp_add_device()
PNP: Mark the function pnp_build_option() as static in resource.c
PNP / card: add missing put_device() call
PNPACPI: check return value of pnp_add_device()
Diffstat (limited to 'drivers/pnp/pnpbios/core.c')
| -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; |