diff options
| author | Tejun Heo | 2007-02-17 18:24:37 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2007-02-21 10:58:17 +0100 |
| commit | 4d05447ec702364b8a2aebb4d625b16479268575 (patch) | |
| tree | 1a3ed3c67f9c9ea5229aa3a368809101e9711bc7 /drivers/ata/libata-core.c | |
| parent | SATA: use NULL for ptrs (diff) | |
| download | kernel-qcow2-linux-4d05447ec702364b8a2aebb4d625b16479268575.tar.gz kernel-qcow2-linux-4d05447ec702364b8a2aebb4d625b16479268575.tar.xz kernel-qcow2-linux-4d05447ec702364b8a2aebb4d625b16479268575.zip | |
libata: fix probe_ent alloc/free bugs
ata_probe_ent_alloc() had a temporary hack such that devm_kzalloc()
was used for allocation if devres had been previously initialized on
the device; otherwise, plain kzalloc() was used. This was to make the
code useable from both the old and devres-aware libata drivers during
transition. This hack made ata_sas_port_alloc() unable to determine
how the probe_ent is allocated, causing double free in some cases.
Remove the now-unneeded hack and make ata_sas_port_alloc() use
devm_kfree().
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 407e7e15c252..794f327e398a 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5948,11 +5948,7 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port) { struct ata_probe_ent *probe_ent; - /* XXX - the following if can go away once all LLDs are managed */ - if (!list_empty(&dev->devres_head)) - probe_ent = devm_kzalloc(dev, sizeof(*probe_ent), GFP_KERNEL); - else - probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL); + probe_ent = devm_kzalloc(dev, sizeof(*probe_ent), GFP_KERNEL); if (!probe_ent) { printk(KERN_ERR DRV_NAME "(%s): out of memory\n", kobject_name(&(dev->kobj))); |