diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2007-04-18 13:34:12 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-02 19:02:43 -0700 |
| commit | 9890b12a4a65a7b3181dd963421740edf0e14d69 (patch) | |
| tree | 2bdd7480a28ea6a31db49f768fa83333a61a5a16 /drivers/pci | |
| parent | c0affe9db42bf85f4a606b3262c35ec59a5d3788 (diff) | |
| download | linux-9890b12a4a65a7b3181dd963421740edf0e14d69.tar.gz linux-9890b12a4a65a7b3181dd963421740edf0e14d69.tar.bz2 linux-9890b12a4a65a7b3181dd963421740edf0e14d69.zip | |
PCI: Free resource files in error path of pci_create_sysfs_dev_files()
pci_create_sysfs_dev_files() should call pci_remove_resource_files() in
its error path, to match the call it makes to pci_create_resource_files().
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 29676fe4f23e..284e83a527f9 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -636,7 +636,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) goto err_rom; } else { retval = -ENOMEM; - goto err_bin_file; + goto err_resource_files; } } /* add platform-specific attributes */ @@ -646,6 +646,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) err_rom: kfree(rom_attr); +err_resource_files: + pci_remove_resource_files(pdev); err_bin_file: if (pdev->cfg_size < 4096) sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr); |