diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-10 23:40:42 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-10 23:40:42 +0200 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /arch/x86/kvm/i8259.c | |
| parent | Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | Linux 4.11-rc6 (diff) | |
| download | linux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz linux-b769fefb68cd70385d68220ae341e5a10723fbc0.zip | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'arch/x86/kvm/i8259.c')
| -rw-r--r-- | arch/x86/kvm/i8259.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index 73ea24d4f119..047b17a26269 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c @@ -657,6 +657,9 @@ void kvm_pic_destroy(struct kvm *kvm) { struct kvm_pic *vpic = kvm->arch.vpic; + if (!vpic) + return; + kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master); kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave); kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr); |