]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Tue, 3 Jan 2017 11:30:27 +0000 (17:00 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Nov 2017 08:01:06 +0000 (09:01 +0100)
[ Upstream commit 4b0ea93f250afc6c1128e201b0a8a115ae613e47 ]

Here, pci_iomap can fail, handle this case and return -ENOMEM.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1483443027-13444-1-git-send-email-arvind.yadav.cs@gmail.com
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/mgag200/mgag200_main.c

index f6b283b8375ec7071adb32459a1bc2f6427dc2ad..d8352e47774dc497d9d54c67bebd8bfff02064c9 100644 (file)
@@ -138,6 +138,8 @@ static int mga_vram_init(struct mga_device *mdev)
        }
 
        mem = pci_iomap(mdev->dev->pdev, 0, 0);
+       if (!mem)
+               return -ENOMEM;
 
        mdev->mc.vram_size = mga_probe_vram(mdev, mem);