diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-26 18:28:36 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-26 18:28:36 +0300 |
| commit | b8bc3bde9c8c90500c648627d53f846642ff8639 (patch) | |
| tree | 0c3ed82848a25948206556bc699a10d30bd18d07 /drivers/media/usb/as102/as102_fw.c | |
| parent | 171b5682aa8597174e80ec4128c87538103f2213 (diff) | |
| parent | 9abc2a08a7d665b02bdde974fd6c44aae86e923e (diff) | |
| download | linux-b8bc3bde9c8c90500c648627d53f846642ff8639.tar.xz | |
Merge tag 'kvm-s390-master-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes for kvm/master (targeting 4.5)
1. Fallout of some bigger floating point/vector rework in s390
- memory leak -> stable 4.3+
- memory overwrite -> stable 4.4+
2. enable KVM-VFIO for s390
Diffstat (limited to 'drivers/media/usb/as102/as102_fw.c')
| -rw-r--r-- | drivers/media/usb/as102/as102_fw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/as102/as102_fw.c b/drivers/media/usb/as102/as102_fw.c index 07d08c49f4d4..5a28ce3a1d49 100644 --- a/drivers/media/usb/as102/as102_fw.c +++ b/drivers/media/usb/as102/as102_fw.c @@ -198,6 +198,7 @@ int as102_fw_upload(struct as10x_bus_adapter_t *bus_adap) pr_info("%s: firmware: %s loaded with success\n", DRIVER_NAME, fw1); release_firmware(firmware); + firmware = NULL; /* wait for boot to complete */ mdelay(100); |