summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-11-07 16:40:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2023-11-07 16:40:42 -0800
commitd3fbdb8ad33491f7c241a1167d7e3009f6e3f085 (patch)
tree95adc3aa7aeb69c1e4f98c1be16e2e56781f2c7c /drivers/pcmcia/cs.c
parentdc1434801d2ee8b57286f587877e67d2f9b699d6 (diff)
parent4f733de8b78a209501041a4b0a44c83ece0e8933 (diff)
downloadlinux-d3fbdb8ad33491f7c241a1167d7e3009f6e3f085.tar.gz
linux-d3fbdb8ad33491f7c241a1167d7e3009f6e3f085.tar.bz2
linux-d3fbdb8ad33491f7c241a1167d7e3009f6e3f085.zip
Merge tag 'pcmcia-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull PCMCIA updates from Dominik Brodowski: "Cleanups and fixes. Yang Yingliang has fixed a number of resource leaks and Dongliang Mu contributed a spelling fix for the PCMCIA core. Also included is a tiny clenaup to the tcic PCMCIA socket driver provided by lizhe" * tag 'pcmcia-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux: pcmcia: tcic: remove unneeded "&" in call to setup_timer() pcmcia: typo fix pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() pcmcia: ds: fix refcount leak in pcmcia_device_add() pcmcia: cs: fix possible hung task and memory leak pccardd()
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r--drivers/pcmcia/cs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 5658745c398f..b33be1e63c98 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -605,6 +605,7 @@ static int pccardd(void *__skt)
dev_warn(&skt->dev, "PCMCIA: unable to register socket\n");
skt->thread = NULL;
complete(&skt->thread_done);
+ put_device(&skt->dev);
return 0;
}
ret = pccard_sysfs_add_socket(&skt->dev);