From 5a67a81c595e0e596c09c9a0e61d69e64dc14f07 Mon Sep 17 00:00:00 2001 From: Darren Jenkins Date: Tue, 12 Jan 2010 23:37:07 +1100 Subject: [PATCH] --- yaml --- r: 179669 b: refs/heads/master c: 7f07a605a3929d2d94dcbad8ccb7d280958d21f9 h: refs/heads/master i: 179667: c142984e4da7644d37981e26cdd196aafa6f8bd9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/power_meter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1440df1c2cb8..4208970ba27c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c19bdb6126a5e1f43b4a4fc3c4b09c926667e5ef +refs/heads/master: 7f07a605a3929d2d94dcbad8ccb7d280958d21f9 diff --git a/trunk/drivers/acpi/power_meter.c b/trunk/drivers/acpi/power_meter.c index ca75c36f754c..dc4ffadf8122 100644 --- a/trunk/drivers/acpi/power_meter.c +++ b/trunk/drivers/acpi/power_meter.c @@ -534,6 +534,7 @@ static void remove_domain_devices(struct acpi_power_meter_resource *resource) kfree(resource->domain_devices); kobject_put(resource->holders_dir); + resource->num_domain_devices = 0; } static int read_domain_devices(struct acpi_power_meter_resource *resource) @@ -740,7 +741,6 @@ static int setup_attrs(struct acpi_power_meter_resource *resource) return res; error: - remove_domain_devices(resource); remove_attrs(resource); return res; }