[4/4,Patch-next] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.

Commit Message

Jin Dongming Aug. 17, 2010, 12:58 a.m. UTC

None

Patch

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 385a605..b35c622 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -302,7 +302,7 @@  static int __devinit ghes_probe(struct platform_device *ghes_dev)
 	struct ghes *ghes = NULL;
 	int rc = -EINVAL;
 
-	generic = ghes_dev->dev.platform_data;
+	generic = *(struct acpi_hest_generic **)(ghes_dev->dev.platform_data);
 	if (!generic->enabled)
 		return -ENODEV;
 
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 343168d..5a65e2a 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -137,20 +137,29 @@  static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
 
 static int hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
 {
-	struct acpi_hest_generic *generic;
+	void **platform_data;
 	struct platform_device *ghes_dev;
 	struct ghes_arr *ghes_arr = data;
 	int rc;
 
 	if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR)
 		return 0;
-	generic = (struct acpi_hest_generic *)hest_hdr;
-	if (!generic->enabled)
+
+	platform_data = kmalloc(sizeof(void *), GFP_KERNEL);
+	if (!platform_data)
+		return -ENOMEM;
+
+	*platform_data = hest_hdr;
+	if (!((struct acpi_hest_generic *)*platform_data)->enabled)
 		return 0;
+
 	ghes_dev = platform_device_alloc("GHES", hest_hdr->source_id);
-	if (!ghes_dev)
+	if (!ghes_dev) {
+		kfree(platform_data);
 		return -ENOMEM;
-	ghes_dev->dev.platform_data = generic;
+	}
+
+	ghes_dev->dev.platform_data = platform_data;
 	rc = platform_device_add(ghes_dev);
 	if (rc)
 		goto err;