diff options
| author | Liu ShuoX <shuox.liu@intel.com> | 2013-07-16 04:23:44 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-17 19:38:59 -0400 |
| commit | 3c0fc0710185e618a661528eed2183102e25c2f8 (patch) | |
| tree | dbe6d7e2df3c9986d6175771d0520d6aacaecd8c | |
| parent | d19f503e22316a84c39bc19445e0e4fdd49b3532 (diff) | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/pnp/resource.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 9847ab163829..167f3d00c916 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, | |||
| 180 | struct pnp_dev *dev = data; | 180 | struct pnp_dev *dev = data; |
| 181 | struct acpi_resource_dma *dma; | 181 | struct acpi_resource_dma *dma; |
| 182 | struct acpi_resource_vendor_typed *vendor_typed; | 182 | struct acpi_resource_vendor_typed *vendor_typed; |
| 183 | struct resource r; | 183 | struct resource r = {0}; |
| 184 | int i, flags; | 184 | int i, flags; |
| 185 | 185 | ||
| 186 | if (acpi_dev_resource_memory(res, &r) | 186 | if (acpi_dev_resource_memory(res, &r) |
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 3e6db1c1dc29..d95e101ffb43 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, | |||
| 515 | } | 515 | } |
| 516 | 516 | ||
| 517 | pnp_res->res = *res; | 517 | pnp_res->res = *res; |
| 518 | pnp_res->res.name = dev->name; | ||
| 518 | dev_dbg(&dev->dev, "%pR\n", res); | 519 | dev_dbg(&dev->dev, "%pR\n", res); |
| 519 | return pnp_res; | 520 | return pnp_res; |
| 520 | } | 521 | } |
