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

Commit 43821242 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: order userspace suspend and resume requests 



Assert that userspace suspend and resume requests appearing
(almost) immediately are executed in the following order:
suspend, resume. This should result in "pccardctl reset"
behaving the same as before.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent cc83b08f

drivers/pcmcia/cs.c

+9 −7
Original line number Diff line number Diff line
@@ -671,20 +671,22 @@ static int pccardd(void *__skt) 
				socket_remove(skt);

			if (sysfs_events & PCMCIA_UEVENT_INSERT)

				socket_insert(skt);

			if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&

				!(skt->state & SOCKET_CARDBUS)) {

				ret = socket_resume(skt);

				if (!ret && skt->callback)

					skt->callback->resume(skt);

			}

			if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&

				!(skt->state & SOCKET_CARDBUS)) {

				if (skt->callback)

					ret = skt->callback->suspend(skt);

				else

					ret = 0;

				if (!ret)

				if (!ret) {

					socket_suspend(skt);

					msleep(100);

				}

			}

			if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&

				!(skt->state & SOCKET_CARDBUS)) {

				ret = socket_resume(skt);

				if (!ret && skt->callback)

					skt->callback->resume(skt);

			}

			if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&

				!(skt->state & SOCKET_CARDBUS)) {