summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-core.c
diff options
context:
space:
mode:
authorSimona Vetter <simona.vetter@ffwll.ch>2024-09-11 09:18:15 +0200
committerSimona Vetter <simona.vetter@ffwll.ch>2024-09-11 09:18:15 +0200
commitb615b9c36cae0468491547206406a909a9a37f26 (patch)
tree1d9586e498714e56e7923765640ae014584e1f58 /drivers/ata/libata-core.c
parentMerge tag 'drm-misc-next-fixes-2024-09-05' of https://gitlab.freedesktop.org/... (diff)
parentLinux 6.11-rc7 (diff)
downloadlinux-b615b9c36cae0468491547206406a909a9a37f26.tar.xz
linux-b615b9c36cae0468491547206406a909a9a37f26.zip
Merge v6.11-rc7 into drm-next
Thomas needs 5a498d4d06d6 ("drm/fbdev-dma: Only install deferred I/O if necessary") in drm-misc, so start the backmerge cascade. Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r--drivers/ata/libata-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c7752dc80028..30932552437a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5593,8 +5593,10 @@ struct ata_host *ata_host_alloc(struct device *dev, int n_ports)
}
dr = devres_alloc(ata_devres_release, 0, GFP_KERNEL);
- if (!dr)
+ if (!dr) {
+ kfree(host);
goto err_out;
+ }
devres_add(dev, dr);
dev_set_drvdata(dev, host);