From 2ba0a33d22c70e995d3ede07d569c736eae13b63 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 7 Jul 2012 09:22:15 +0000 Subject: [PATCH] --- yaml --- r: 318714 b: refs/heads/master c: 4dbdf0aea9585add9359e7ca5535256f866ec85c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c46f7f07145..eb574a51cd12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f60ec4c7df043df81e62891ac45383d012afe0da +refs/heads/master: 4dbdf0aea9585add9359e7ca5535256f866ec85c diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c b/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c index 93e832d6c328..ea1024d79974 100644 --- a/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -47,6 +47,9 @@ static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) bool primary = false; ap = alloc_apertures(1); + if (!ap) + return; + ap->ranges[0].base = pci_resource_start(pdev, 0); ap->ranges[0].size = pci_resource_len(pdev, 0);