drm/cirrus: check alloc_apertures() success in cirrus_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>

diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index 101e423c8991463fa22b0406175920360f7a2d36..dcd1a8c029ebb8958ab617e03dd53768c8b71e2d 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -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;
        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);
 
@@ -49,12 +52,18 @@ static void cirrus_kick_out_firmware_fb(struct pci_dev *pdev)
 #endif
        remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);
        kfree(ap);
+
+       return 0;
 }
 
 static int __devinit
 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);
 }