diff options
| author | Niklas Cassel <cassel@kernel.org> | 2024-07-04 11:19:58 +0200 |
|---|---|---|
| committer | Niklas Cassel <cassel@kernel.org> | 2024-07-04 11:37:15 +0200 |
| commit | 831d83a5374af5c03d7771ef85fd9d46d685cf55 (patch) | |
| tree | 70a65465492dc680d49d732ee6bebdde74e2da66 /drivers/scsi/libsas/sas_ata.c | |
| parent | 816be86c7993d3c5832c3017c0056297e86f978c (diff) | |
| parent | eeb25a09c5e0805d92e4ebd12c4b0ad0df1b0295 (diff) | |
Merge remote-tracking branch 'libata/for-6.10-fixes' into for-6.11
Pull in bug fixes.
Diffstat (limited to 'drivers/scsi/libsas/sas_ata.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 4c69fc63c119..cbbe43d8ef87 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -610,15 +610,15 @@ int sas_ata_init(struct domain_device *found_dev) rc = ata_sas_tport_add(ata_host->dev, ap); if (rc) - goto destroy_port; + goto free_port; found_dev->sata_dev.ata_host = ata_host; found_dev->sata_dev.ap = ap; return 0; -destroy_port: - kfree(ap); +free_port: + ata_port_free(ap); free_host: ata_host_put(ata_host); return rc; |