Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
core
/
seq
/
oss
/
seq_oss_readq.c
diff --git
a/kernel/sound/core/seq/oss/seq_oss_readq.c
b/kernel/sound/core/seq/oss/seq_oss_readq.c
index
c080c73
..
046cb58
100644
(file)
--- a/
kernel/sound/core/seq/oss/seq_oss_readq.c
+++ b/
kernel/sound/core/seq/oss/seq_oss_readq.c
@@
-91,8
+91,7
@@
snd_seq_oss_readq_clear(struct seq_oss_readq *q)
q->head = q->tail = 0;
}
/* if someone sleeping, wake'em up */
q->head = q->tail = 0;
}
/* if someone sleeping, wake'em up */
- if (waitqueue_active(&q->midi_sleep))
- wake_up(&q->midi_sleep);
+ wake_up(&q->midi_sleep);
q->input_time = (unsigned long)-1;
}
q->input_time = (unsigned long)-1;
}
@@
-138,8
+137,7
@@
snd_seq_oss_readq_put_event(struct seq_oss_readq *q, union evrec *ev)
q->qlen++;
/* wake up sleeper */
q->qlen++;
/* wake up sleeper */
- if (waitqueue_active(&q->midi_sleep))
- wake_up(&q->midi_sleep);
+ wake_up(&q->midi_sleep);
spin_unlock_irqrestore(&q->lock, flags);
spin_unlock_irqrestore(&q->lock, flags);
@@
-222,7
+220,7
@@
snd_seq_oss_readq_put_timestamp(struct seq_oss_readq *q, unsigned long curt, int
}
}
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_
SND_
PROC_FS
/*
* proc interface
*/
/*
* proc interface
*/
@@
-233,4
+231,4
@@
snd_seq_oss_readq_info_read(struct seq_oss_readq *q, struct snd_info_buffer *buf
(waitqueue_active(&q->midi_sleep) ? "sleeping":"running"),
q->qlen, q->input_time);
}
(waitqueue_active(&q->midi_sleep) ? "sleeping":"running"),
q->qlen, q->input_time);
}
-#endif /* CONFIG_PROC_FS */
+#endif /* CONFIG_
SND_
PROC_FS */