Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 08:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: rpaphp: match up alloc and free in same routine

Browse Source 
The routine that called an alloc should be the same routine that 
calles the mathcing free, if anything in the middle failed.

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>
This commit is contained in:
Linas Vepstas 2007-04-13 15:34:09 -07:00 committed by Greg Kroah-Hartman
parent fa1891596c
commit 31be7586d1
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/hotplug/rpaphp_core.c
View File

@ -321,10 +321,15 @@ int rpaphp_add_slot(struct device_node *dn)
indexes[i + 1], name, type);
retval = rpaphp_register_pci_slot(slot);
if (retval)
dealloc_slot_struct(slot);
name += strlen(name) + 1;
type += strlen(type) + 1;
}
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
/* XXX FIXME: reports a failure only if last entry in loop failed */
return retval;
}

1
drivers/pci/hotplug/rpaphp_pci.c
View File

@ -195,7 +195,6 @@ static int setup_pci_slot(struct slot *slot)
}
return 0;
exit_rc:
dealloc_slot_struct(slot);
return -EINVAL;
}

1
drivers/pci/hotplug/rpaphp_slot.c
View File

@ -184,7 +184,6 @@ int rpaphp_register_slot(struct slot *slot)
sysfs_fail:
pci_hp_deregister(php_slot);
register_fail:
rpaphp_release_slot(php_slot);
return retval;
}