aboutsummaryrefslogtreecommitdiff
path: root/drivers/pnp
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/pnpacpi/core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index c283a9a70d8..53f91068d0b 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -213,8 +213,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
&dev->res);
if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s",
- dev_id->id);
- goto err1;
+ acpi_device_hid(device));
}
}
@@ -223,8 +222,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
dev);
if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s",
- dev_id->id);
- goto err1;
+ acpi_device_hid(device));
}
}
@@ -252,8 +250,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
num++;
return AE_OK;
-err1:
- kfree(dev_id);
err:
kfree(dev);
return -EINVAL;