diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pnp/pnpacpi/core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index c283a9a70d83..53f91068d0b0 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) | |||
213 | &dev->res); | 213 | &dev->res); |
214 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { | 214 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { |
215 | pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s", | 215 | pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s", |
216 | dev_id->id); | 216 | acpi_device_hid(device)); |
217 | goto err1; | ||
218 | } | 217 | } |
219 | } | 218 | } |
220 | 219 | ||
@@ -223,8 +222,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device) | |||
223 | dev); | 222 | dev); |
224 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { | 223 | if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { |
225 | pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s", | 224 | pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s", |
226 | dev_id->id); | 225 | acpi_device_hid(device)); |
227 | goto err1; | ||
228 | } | 226 | } |
229 | } | 227 | } |
230 | 228 | ||
@@ -252,8 +250,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device) | |||
252 | num++; | 250 | num++; |
253 | 251 | ||
254 | return AE_OK; | 252 | return AE_OK; |
255 | err1: | ||
256 | kfree(dev_id); | ||
257 | err: | 253 | err: |
258 | kfree(dev); | 254 | kfree(dev); |
259 | return -EINVAL; | 255 | return -EINVAL; |