Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593f010b authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: do not lock socket driver module in pcmcia_get_socket() 



Do not lock the socket driver module in pcmcia_get_socket(), as
the PCMCIA core can handle a socket module removal: In
pcmcia_unregister_socket(), we explicitely wait for the last
put_device() to succeed.

Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 3f32b3c0

drivers/pcmcia/cs.c

+1 −7
Original line number Diff line number Diff line
@@ -140,19 +140,13 @@ struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt) 
	struct device *dev = get_device(&skt->dev);

	if (!dev)

		return NULL;

	skt = dev_get_drvdata(dev);

	if (!try_module_get(skt->owner)) {

		put_device(&skt->dev);

		return NULL;

	}

	return skt;

	return dev_get_drvdata(dev);

}

EXPORT_SYMBOL(pcmcia_get_socket);





void pcmcia_put_socket(struct pcmcia_socket *skt)

{

	module_put(skt->owner);

	put_device(&skt->dev);

}

EXPORT_SYMBOL(pcmcia_put_socket);