projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[deliverable/linux.git]
/
virt
/
lib
/
irqbypass.c
diff --git
a/virt/lib/irqbypass.c
b/virt/lib/irqbypass.c
index 09a03b5a21ff239cb7f4afd36e9e0f723098a422..52abac4bb6a2532ad55f4ec690530a6a7b593df0 100644
(file)
--- a/
virt/lib/irqbypass.c
+++ b/
virt/lib/irqbypass.c
@@
-89,6
+89,9
@@
int irq_bypass_register_producer(struct irq_bypass_producer *producer)
struct irq_bypass_producer *tmp;
struct irq_bypass_consumer *consumer;
struct irq_bypass_producer *tmp;
struct irq_bypass_consumer *consumer;
+ if (!producer->token)
+ return -EINVAL;
+
might_sleep();
if (!try_module_get(THIS_MODULE))
might_sleep();
if (!try_module_get(THIS_MODULE))
@@
-136,6
+139,9
@@
void irq_bypass_unregister_producer(struct irq_bypass_producer *producer)
struct irq_bypass_producer *tmp;
struct irq_bypass_consumer *consumer;
struct irq_bypass_producer *tmp;
struct irq_bypass_consumer *consumer;
+ if (!producer->token)
+ return;
+
might_sleep();
if (!try_module_get(THIS_MODULE))
might_sleep();
if (!try_module_get(THIS_MODULE))
@@
-177,7
+183,8
@@
int irq_bypass_register_consumer(struct irq_bypass_consumer *consumer)
struct irq_bypass_consumer *tmp;
struct irq_bypass_producer *producer;
struct irq_bypass_consumer *tmp;
struct irq_bypass_producer *producer;
- if (!consumer->add_producer || !consumer->del_producer)
+ if (!consumer->token ||
+ !consumer->add_producer || !consumer->del_producer)
return -EINVAL;
might_sleep();
return -EINVAL;
might_sleep();
@@
-227,6
+234,9
@@
void irq_bypass_unregister_consumer(struct irq_bypass_consumer *consumer)
struct irq_bypass_consumer *tmp;
struct irq_bypass_producer *producer;
struct irq_bypass_consumer *tmp;
struct irq_bypass_producer *producer;
+ if (!consumer->token)
+ return;
+
might_sleep();
if (!try_module_get(THIS_MODULE))
might_sleep();
if (!try_module_get(THIS_MODULE))
This page took
0.026067 seconds
and
5
git commands to generate.