projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-microblaze.git]
/
drivers
/
video
/
fbdev
/
hyperv_fb.c
diff --git
a/drivers/video/fbdev/hyperv_fb.c
b/drivers/video/fbdev/hyperv_fb.c
index
c8b0ae6
..
4dc9077
100644
(file)
--- a/
drivers/video/fbdev/hyperv_fb.c
+++ b/
drivers/video/fbdev/hyperv_fb.c
@@
-1031,7
+1031,6
@@
static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
if (!pdev) {
pr_err("Unable to find PCI Hyper-V video\n");
PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
if (!pdev) {
pr_err("Unable to find PCI Hyper-V video\n");
- kfree(info->apertures);
return -ENODEV;
}
return -ENODEV;
}
@@
-1129,7
+1128,6
@@
getmem_done:
} else {
pci_dev_put(pdev);
}
} else {
pci_dev_put(pdev);
}
- kfree(info->apertures);
return 0;
return 0;
@@
-1141,7
+1139,6
@@
err2:
err1:
if (!gen2vm)
pci_dev_put(pdev);
err1:
if (!gen2vm)
pci_dev_put(pdev);
- kfree(info->apertures);
return -ENOMEM;
}
return -ENOMEM;
}