projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[platform/kernel/linux-exynos.git]
/
drivers
/
pcmcia
/
cs.c
diff --git
a/drivers/pcmcia/cs.c
b/drivers/pcmcia/cs.c
index
8007bfd
..
c3b615c
100644
(file)
--- a/
drivers/pcmcia/cs.c
+++ b/
drivers/pcmcia/cs.c
@@
-621,8
+621,6
@@
static int pccardd(void *__skt)
unsigned int events;
unsigned int sysfs_events;
unsigned int events;
unsigned int sysfs_events;
- set_current_state(TASK_INTERRUPTIBLE);
-
spin_lock_irqsave(&skt->thread_lock, flags);
events = skt->thread_events;
skt->thread_events = 0;
spin_lock_irqsave(&skt->thread_lock, flags);
events = skt->thread_events;
skt->thread_events = 0;
@@
-670,11
+668,15
@@
static int pccardd(void *__skt)
if (kthread_should_stop())
break;
if (kthread_should_stop())
break;
+ set_current_state(TASK_INTERRUPTIBLE);
+
schedule();
schedule();
+
+ /* make sure we are running */
+ __set_current_state(TASK_RUNNING);
+
try_to_freeze();
}
try_to_freeze();
}
- /* make sure we are running before we exit */
- set_current_state(TASK_RUNNING);
/* shut down socket, if a device is still present */
if (skt->state & SOCKET_PRESENT) {
/* shut down socket, if a device is still present */
if (skt->state & SOCKET_PRESENT) {