Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/cirrus: check alloc_apertures() success in cirrus_kick_out_firmware_fb()

Browse source 
Check for alloc_apertures() memory allocation failure, and propagate an
error code in case the allocation failed.

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Tommi Rantala 2012-11-09 09:19:35 +00:00 committed by Dave Airlie
parent 91926741ec
commit bfb82ff0ee
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/cirrus/cirrus_drv.c
View file

@ -35,12 +35,15 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
}; };
static void cirrus_kick_out_firmware_fb(struct pci_dev *pdev) static int cirrus_kick_out_firmware_fb(struct pci_dev *pdev)
{ {
struct apertures_struct *ap; struct apertures_struct *ap;
bool primary = false; bool primary = false;
ap = alloc_apertures(1); ap = alloc_apertures(1);
if (!ap)
return -ENOMEM;
ap->ranges[0].base = pci_resource_start(pdev, 0); ap->ranges[0].base = pci_resource_start(pdev, 0);
ap->ranges[0].size = pci_resource_len(pdev, 0); ap->ranges[0].size = pci_resource_len(pdev, 0);
@ -49,12 +52,18 @@ static void cirrus_kick_out_firmware_fb(struct pci_dev *pdev)
#endif #endif
remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary); remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);
kfree(ap); kfree(ap);
return 0;
} }
static int __devinit static int __devinit
cirrus_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) cirrus_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
cirrus_kick_out_firmware_fb(pdev); int ret;
ret = cirrus_kick_out_firmware_fb(pdev);
if (ret)
return ret;
return drm_get_pci_dev(pdev, ent, &driver); return drm_get_pci_dev(pdev, ent, &driver);
} }