From ac03cb7755630fba33fe3a7c4282ce3679619f6c Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 23 Mar 2013 19:16:37 +0000 Subject: [PATCH] --- yaml --- r: 367580 b: refs/heads/master c: f084dbb939070281be7c882db63a4a428c51fcf4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_link.c | 1 + trunk/drivers/platform/x86/sony-laptop.c | 3 ++- trunk/drivers/pnp/pnpacpi/rsparser.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33bc48350242..0f74cf95fd72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eccc534378e74030b31cfe10f1188df06f7f680a +refs/heads/master: f084dbb939070281be7c882db63a4a428c51fcf4 diff --git a/trunk/drivers/acpi/pci_link.c b/trunk/drivers/acpi/pci_link.c index ab764ed34a50..2652a614deeb 100644 --- a/trunk/drivers/acpi/pci_link.c +++ b/trunk/drivers/acpi/pci_link.c @@ -354,6 +354,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) } resource->end.type = ACPI_RESOURCE_TYPE_END_TAG; + resource->end.length = sizeof(struct acpi_resource); /* Attempt to set the resource */ status = acpi_set_current_resources(link->device->handle, &buffer); diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c index 14d4dced1def..d544e3aaf761 100644 --- a/trunk/drivers/platform/x86/sony-laptop.c +++ b/trunk/drivers/platform/x86/sony-laptop.c @@ -4121,7 +4121,7 @@ static int sony_pic_enable(struct acpi_device *device, resource->res3.data.irq.sharable = ACPI_SHARED; resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG; - + resource->res4.length = sizeof(struct acpi_resource); } /* setup Type 2/3 resources */ else { @@ -4140,6 +4140,7 @@ static int sony_pic_enable(struct acpi_device *device, resource->res2.data.irq.sharable = ACPI_SHARED; resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG; + resource->res3.length = sizeof(struct acpi_resource); } /* Attempt to set the resource */ diff --git a/trunk/drivers/pnp/pnpacpi/rsparser.c b/trunk/drivers/pnp/pnpacpi/rsparser.c index b8f4ea7b27fc..9847ab163829 100644 --- a/trunk/drivers/pnp/pnpacpi/rsparser.c +++ b/trunk/drivers/pnp/pnpacpi/rsparser.c @@ -634,6 +634,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev, } /* resource will pointer the end resource now */ resource->type = ACPI_RESOURCE_TYPE_END_TAG; + resource->length = sizeof(struct acpi_resource); return 0; }