diff options
| author | Tommi Rantala | 2012-11-09 10:19:39 +0100 |
|---|---|---|
| committer | Dave Airlie | 2012-11-20 07:06:27 +0100 |
| commit | 302381511f4b1bc98c6f61ccaec5d8e98ccd0365 (patch) | |
| tree | 8b27820e0bb4a72aa328a46385aa4ace2109bfdd /drivers/gpu | |
| parent | drm/mgag200: remove unneeded aper->count assignment after alloc_apertures() (diff) | |
| download | kernel-qcow2-linux-302381511f4b1bc98c6f61ccaec5d8e98ccd0365.tar.gz kernel-qcow2-linux-302381511f4b1bc98c6f61ccaec5d8e98ccd0365.tar.xz kernel-qcow2-linux-302381511f4b1bc98c6f61ccaec5d8e98ccd0365.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 07eb84e8a8a4..8c1a83c6eb07 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -281,12 +281,15 @@ static struct drm_driver driver_old = { 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; bool primary = false; ap = alloc_apertures(1); + if (!ap) + return -ENOMEM; + ap->ranges[0].base = pci_resource_start(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 remove_conflicting_framebuffers(ap, "radeondrmfb", primary); kfree(ap); + + return 0; } static int __devinit radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { + int ret; + /* 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); } |