Commit 5fd39c35 authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman

PCI: rpaphp: Fix a memleak; slot->location string was never freed

Fix a memleak; the slot->location string was never freed.
Fix some whitespace and overlong-line probelms while we're here.
Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 31be7586
...@@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = { ...@@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = {
static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot) static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = (struct slot *) hotplug_slot->private; struct slot *slot = (struct slot *) hotplug_slot->private;
dealloc_slot_struct(slot); dealloc_slot_struct(slot);
} }
...@@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot) ...@@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot)
kfree(slot->hotplug_slot->info); kfree(slot->hotplug_slot->info);
kfree(slot->hotplug_slot->name); kfree(slot->hotplug_slot->name);
kfree(slot->hotplug_slot); kfree(slot->hotplug_slot);
kfree(slot->location);
kfree(slot); kfree(slot);
return;
} }
struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, struct slot *alloc_slot_struct(struct device_node *dn,
int power_domain) int drc_index, char *drc_name, int power_domain)
{ {
struct slot *slot; struct slot *slot;
...@@ -115,7 +114,7 @@ error_nomem: ...@@ -115,7 +114,7 @@ error_nomem:
static int is_registered(struct slot *slot) static int is_registered(struct slot *slot)
{ {
struct slot *tmp_slot; struct slot *tmp_slot;
list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) { list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) {
if (!strcmp(tmp_slot->name, slot->name)) if (!strcmp(tmp_slot->name, slot->name))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment