redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

PNPACPI: check return value of pnp_add_device() 

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

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
hifive-unleashed-5.1
Dmitry Torokhov 2013-12-15 04:10:11 -08:00 committed by Rafael J. Wysocki
parent 319e2e3f63
commit 249135d1a2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pnp/pnpacpi/core.c
View File

@ -242,6 +242,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
struct pnp_dev *dev;
char *pnpid;
struct acpi_hardware_id *id;
int error;
/* Skip devices that are already bound */
if (device->physical_node_count)
@ -300,10 +301,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,