Skip to content

Commit

Permalink
PCI: rpaphp: Fix a memleak; slot->location string was never freed
Browse files Browse the repository at this point in the history
Fix a memleak; the slot->location string was never freed.
Fix some whitespace and overlong-line probelms while we're here.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Linas Vepstas authored and Greg Kroah-Hartman committed May 3, 2007
1 parent 31be758 commit 5fd39c3
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/pci/hotplug/rpaphp_slot.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = {
static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
{
struct slot *slot = (struct slot *) hotplug_slot->private;

dealloc_slot_struct(slot);
}

Expand All @@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot)
kfree(slot->hotplug_slot->info);
kfree(slot->hotplug_slot->name);
kfree(slot->hotplug_slot);
kfree(slot->location);
kfree(slot);
return;
}

struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name,
int power_domain)
struct slot *alloc_slot_struct(struct device_node *dn,
int drc_index, char *drc_name, int power_domain)
{
struct slot *slot;

Expand Down Expand Up @@ -115,7 +114,7 @@ struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_

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) {
if (!strcmp(tmp_slot->name, slot->name))
Expand Down

0 comments on commit 5fd39c3

Please sign in to comment.