diff options
Diffstat (limited to 'drivers/acpi/acpica/rslist.c')
| -rw-r--r-- | drivers/acpi/acpica/rslist.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c index 0307675d37be..e46efaa889cd 100644 --- a/drivers/acpi/acpica/rslist.c +++ b/drivers/acpi/acpica/rslist.c @@ -59,7 +59,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,  		    AML_RESOURCE_MAX_SERIALBUSTYPE) {  			conversion_table = NULL;  		} else { -			/* This is an I2C, SPI, or UART serial_bus descriptor */ +			/* This is an I2C, SPI, UART, or CSI2 serial_bus descriptor */  			conversion_table =  			    acpi_gbl_convert_resource_serial_bus_dispatch @@ -89,6 +89,11 @@ acpi_rs_convert_aml_to_resources(u8 * aml,  		return_ACPI_STATUS(status);  	} +	if (!resource->length) { +		ACPI_EXCEPTION((AE_INFO, status, +				"Zero-length resource returned from RsConvertAmlToResource")); +	} +  	ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,  			  "Type %.2X, AmlLength %.2X InternalLength %.2X\n",  			  acpi_ut_get_resource_type(aml), length, @@ -158,7 +163,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,  			    AML_RESOURCE_MAX_SERIALBUSTYPE) {  				conversion_table = NULL;  			} else { -				/* This is an I2C, SPI, or UART serial_bus descriptor */ +				/* This is an I2C, SPI, UART or CSI2 serial_bus descriptor */  				conversion_table =  				    acpi_gbl_convert_resource_serial_bus_dispatch | 
