summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 18:22:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 18:22:51 +0100
commit89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (patch)
tree3a2f1ae599ee4bae60ccf11cc154d73c210c6388 /virt/kvm
parent2e1cc199fc8666ac5fda200e8a99f1e4dea07175 (diff)
parentc6f9b1eb0e5df468891eff17f981b76c86f95f3a (diff)
downloadlinux-89cab4624a8c0ed81a1b74b6f8c884641cac5b9d.tar.bz2
ASoC: core: Merge Samsung fixes to avoid trivial context conflict
Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-component to resolve trivial conflict Conflicts: sound/soc/samsung/i2s.c
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/ioapic.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index ce82b9401958..5ba005c00e2f 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -74,9 +74,12 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
u32 redir_index = (ioapic->ioregsel - 0x10) >> 1;
u64 redir_content;
- ASSERT(redir_index < IOAPIC_NUM_PINS);
+ if (redir_index < IOAPIC_NUM_PINS)
+ redir_content =
+ ioapic->redirtbl[redir_index].bits;
+ else
+ redir_content = ~0ULL;
- redir_content = ioapic->redirtbl[redir_index].bits;
result = (ioapic->ioregsel & 0x1) ?
(redir_content >> 32) & 0xffffffff :
redir_content & 0xffffffff;