diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /drivers/pci/slot.c | |
| parent | 9a4a84294b0d60b8c287131478f743ba2bc68949 (diff) | |
| parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'drivers/pci/slot.c')
| -rw-r--r-- | drivers/pci/slot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 4dd1c3e157ae..5a8ccb4f604d 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -253,6 +253,7 @@ placeholder: | |||
| 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); | 253 | __func__, pci_domain_nr(parent), parent->number, slot_nr); |
| 254 | 254 | ||
| 255 | out: | 255 | out: |
| 256 | kfree(slot_name); | ||
| 256 | up_write(&pci_bus_sem); | 257 | up_write(&pci_bus_sem); |
| 257 | return slot; | 258 | return slot; |
| 258 | err: | 259 | err: |