hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/radeon: check alloc_apertures() success in radeon_kick_out_firmware_fb() 

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:39 +00:00 committed by Dave Airlie
parent b0e77f45a6
commit 302381511f
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/radeon/radeon_drv.c
View File

@ -281,12 +281,15 @@ static struct drm_driver driver_old = {
static struct drm_driver kms_driver; static struct drm_driver kms_driver;
static void radeon_kick_out_firmware_fb(struct pci_dev *pdev) static int radeon_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);
@ -295,13 +298,19 @@ static void radeon_kick_out_firmware_fb(struct pci_dev *pdev)
#endif #endif
remove_conflicting_framebuffers(ap, "radeondrmfb", primary); remove_conflicting_framebuffers(ap, "radeondrmfb", primary);
kfree(ap); kfree(ap);
return 0;
} }
static int __devinit static int __devinit
radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int ret;
/* Get rid of things like offb */ /* Get rid of things like offb */
radeon_kick_out_firmware_fb(pdev); ret = radeon_kick_out_firmware_fb(pdev);
if (ret)
return ret;
return drm_get_pci_dev(pdev, ent, &kms_driver); return drm_get_pci_dev(pdev, ent, &kms_driver);
} }