summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu ShuoX <shuox.liu@intel.com>2013-07-16 08:23:44 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-17 23:38:59 (GMT)
commit3c0fc0710185e618a661528eed2183102e25c2f8 (patch)
treedbe6d7e2df3c9986d6175771d0520d6aacaecd8c
parentd19f503e22316a84c39bc19445e0e4fdd49b3532 (diff)
downloadlinux-3c0fc0710185e618a661528eed2183102e25c2f8.tar.xz
PNP / ACPI: avoid garbage in resource name
Set temporary variable as 0 to avoid garbage string output from /proc/iomem after register resources and reset to PNP dev name later. Signed-off-by: Liu ShuoX <shuox.liu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c2
-rw-r--r--drivers/pnp/resource.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 9847ab1..167f3d0 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -180,7 +180,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
struct pnp_dev *dev = data;
struct acpi_resource_dma *dma;
struct acpi_resource_vendor_typed *vendor_typed;
- struct resource r;
+ struct resource r = {0};
int i, flags;
if (acpi_dev_resource_memory(res, &r)
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 3e6db1c..d95e101 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -515,6 +515,7 @@ struct pnp_resource *pnp_add_resource(struct pnp_dev *dev,
}
pnp_res->res = *res;
+ pnp_res->res.name = dev->name;
dev_dbg(&dev->dev, "%pR\n", res);
return pnp_res;
}