diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-02-20 08:26:06 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-02-20 08:26:06 +0100 |
| commit | d4308febf3551d46884561b7c3fdd62ad3ca7ff2 (patch) | |
| tree | b8c48122df7c36761c6fb5d70647a09605892b9f /drivers/xen/events.c | |
| parent | c206c70924737db6836382c09ad2dacd04bb6204 (diff) | |
| parent | 087ffecdaa1875cc683a7a5bc0695b3ebfce3bad (diff) | |
| download | op-kernel-dev-d4308febf3551d46884561b7c3fdd62ad3ca7ff2.zip op-kernel-dev-d4308febf3551d46884561b7c3fdd62ad3ca7ff2.tar.gz | |
Merge branch 'stable/for-jens-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-3.9/drivers
Konrad writes:
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.9
which has bug-fixes that did not make it in v3.8. They all are marked as
material for the stable tree as well. There are two bug-fixes for
the code that has been in there for some time (that is the Jan's fix
and one of mine). And there are two bug-fixes for the persistent grant
feature that debuted in v3.8 for xen blk[back|front]end.
Diffstat (limited to 'drivers/xen/events.c')
| -rw-r--r-- | drivers/xen/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 0be4df3..74d77df 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -840,7 +840,7 @@ int bind_evtchn_to_irq(unsigned int evtchn) if (irq == -1) { irq = xen_allocate_irq_dynamic(); - if (irq == -1) + if (irq < 0) goto out; irq_set_chip_and_handler_name(irq, &xen_dynamic_chip, @@ -944,7 +944,7 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu) if (irq == -1) { irq = xen_allocate_irq_dynamic(); - if (irq == -1) + if (irq < 0) goto out; irq_set_chip_and_handler_name(irq, &xen_percpu_chip, |
