git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ata-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
libsas
/
sas_discover.c
diff --git
a/drivers/scsi/libsas/sas_discover.c
b/drivers/scsi/libsas/sas_discover.c
index 15cb9965faa2d3c9e747878c2387e34da21a2d98..ff7b63b10aeb372939d12c95fb4dc1be490c6f1e 100644
(file)
--- a/
drivers/scsi/libsas/sas_discover.c
+++ b/
drivers/scsi/libsas/sas_discover.c
@@
-301,7
+301,7
@@
void sas_free_device(struct kref *kref)
if (dev_is_sata(dev) && dev->sata_dev.ap) {
ata_sas_tport_delete(dev->sata_dev.ap);
-
ata_sas_port_destroy
(dev->sata_dev.ap);
+
kfree
(dev->sata_dev.ap);
ata_host_put(dev->sata_dev.ata_host);
dev->sata_dev.ata_host = NULL;
dev->sata_dev.ap = NULL;