diff options
Diffstat (limited to 'virt/kvm/assigned-dev.c')
| -rw-r--r-- | virt/kvm/assigned-dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index fd9c097b760a..f73de631e3ee 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c | |||
| @@ -508,8 +508,8 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, | |||
| 508 | struct kvm_assigned_dev_kernel *match; | 508 | struct kvm_assigned_dev_kernel *match; |
| 509 | struct pci_dev *dev; | 509 | struct pci_dev *dev; |
| 510 | 510 | ||
| 511 | down_read(&kvm->slots_lock); | ||
| 512 | mutex_lock(&kvm->lock); | 511 | mutex_lock(&kvm->lock); |
| 512 | down_read(&kvm->slots_lock); | ||
| 513 | 513 | ||
| 514 | match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head, | 514 | match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head, |
| 515 | assigned_dev->assigned_dev_id); | 515 | assigned_dev->assigned_dev_id); |
| @@ -573,8 +573,8 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, | |||
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | out: | 575 | out: |
| 576 | mutex_unlock(&kvm->lock); | ||
| 577 | up_read(&kvm->slots_lock); | 576 | up_read(&kvm->slots_lock); |
| 577 | mutex_unlock(&kvm->lock); | ||
| 578 | return r; | 578 | return r; |
| 579 | out_list_del: | 579 | out_list_del: |
| 580 | list_del(&match->list); | 580 | list_del(&match->list); |
| @@ -585,8 +585,8 @@ out_put: | |||
| 585 | pci_dev_put(dev); | 585 | pci_dev_put(dev); |
| 586 | out_free: | 586 | out_free: |
| 587 | kfree(match); | 587 | kfree(match); |
| 588 | mutex_unlock(&kvm->lock); | ||
| 589 | up_read(&kvm->slots_lock); | 588 | up_read(&kvm->slots_lock); |
| 589 | mutex_unlock(&kvm->lock); | ||
| 590 | return r; | 590 | return r; |
| 591 | } | 591 | } |
| 592 | 592 | ||
