Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a490498 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNPACPI: continue after _CRS and _PRS errors 



Keep going and register the device even if we have trouble parsing
_CRS or _PRS.  A parsing problem might mean we ignore some resources
the device is using, or we might not be able to change its resources.
But we should still take note of anything we *could* parse correctly.

Also remove reference to dev_id because I plan to remove it soon.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ca0e8b6f

drivers/pnp/pnpacpi/core.c

+2 −6
Original line number Diff line number Diff line
@@ -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;