From b697fd6846741b2b58f38992157d5678a6db54a7 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 28 Apr 2008 16:34:03 -0600
Subject: [PATCH] --- yaml --- r: 95557 b: refs/heads/master c:
 cdef6254e17e98f1071ce1bfc8f2a87997c855d0 h: refs/heads/master i:   95555:
 012f75938bece6543e6b7cd95721e6b3e38c06c7 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/pnp/pnpacpi/core.c     | 4 ++--
 trunk/drivers/pnp/pnpacpi/pnpacpi.h  | 2 +-
 trunk/drivers/pnp/pnpacpi/rsparser.c | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 207faa5d53c9..e7d3de958b58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd7ec927d9cd3d2001cbbdce872bd73f6e49c986
+refs/heads/master: cdef6254e17e98f1071ce1bfc8f2a87997c855d0
diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c
index fd3fca6dddd3..27546873880c 100644
--- a/trunk/drivers/pnp/pnpacpi/core.c
+++ b/trunk/drivers/pnp/pnpacpi/core.c
@@ -88,10 +88,10 @@ static int pnpacpi_set_resources(struct pnp_dev *dev,
 {
 	acpi_handle handle = dev->data;
 	struct acpi_buffer buffer;
-	int ret = 0;
+	int ret;
 	acpi_status status;
 
-	ret = pnpacpi_build_resource_template(handle, &buffer);
+	ret = pnpacpi_build_resource_template(dev, &buffer);
 	if (ret)
 		return ret;
 	ret = pnpacpi_encode_resources(res, &buffer);
diff --git a/trunk/drivers/pnp/pnpacpi/pnpacpi.h b/trunk/drivers/pnp/pnpacpi/pnpacpi.h
index f28e2ed66fa3..116c591d8634 100644
--- a/trunk/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/trunk/drivers/pnp/pnpacpi/pnpacpi.h
@@ -8,5 +8,5 @@
 acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*);
 acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*);
 int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *);
-int pnpacpi_build_resource_template(acpi_handle, struct acpi_buffer*);
+int pnpacpi_build_resource_template(struct pnp_dev *, struct acpi_buffer *);
 #endif
diff --git a/trunk/drivers/pnp/pnpacpi/rsparser.c b/trunk/drivers/pnp/pnpacpi/rsparser.c
index a5f5e2130e75..baaf60212779 100644
--- a/trunk/drivers/pnp/pnpacpi/rsparser.c
+++ b/trunk/drivers/pnp/pnpacpi/rsparser.c
@@ -777,9 +777,10 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
 	return AE_OK;
 }
 
-int pnpacpi_build_resource_template(acpi_handle handle,
+int pnpacpi_build_resource_template(struct pnp_dev *dev,
 				    struct acpi_buffer *buffer)
 {
+	acpi_handle handle = dev->data;
 	struct acpi_resource *resource;
 	int res_cnt = 0;
 	acpi_status status;