diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-29 03:30:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-29 03:31:47 -0400 |
| commit | eebc57f73d42095b778e899f6aa90ad050c72655 (patch) | |
| tree | 2ba80c75e9284093e6d7606dbb1b6a4bb752a2a5 /drivers/base/firmware_class.c | |
| parent | d3a247bfb2c26f5b67367d58af7ad8c2efbbc6c1 (diff) | |
| parent | 2a4ab640d3c28c2952967e5f63ea495555bf2a5f (diff) | |
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 into x86/apic
Merge reason: the SFI (Simple Firmware Interface) feature in the ACPI
tree needs this cleanup, pull it into the APIC branch as
well so that there's no interactions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index f285f441fab9..7376367bcb80 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev, | |||
| 180 | goto err; | 180 | goto err; |
| 181 | } | 181 | } |
| 182 | /* Pages will be freed by vfree() */ | 182 | /* Pages will be freed by vfree() */ |
| 183 | fw_priv->pages = NULL; | ||
| 184 | fw_priv->page_array_size = 0; | 183 | fw_priv->page_array_size = 0; |
| 185 | fw_priv->nr_pages = 0; | 184 | fw_priv->nr_pages = 0; |
| 186 | complete(&fw_priv->completion); | 185 | complete(&fw_priv->completion); |