gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap

ArvindYadavCs · gregkh · commit b1e8e6d4c065 · 2017-11-21T09:21:21.000+01:00
[ 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>
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -145,6 +145,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);
 

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ static int mga_vram_init(struct mga_device *mdev)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`mem = pci_iomap(mdev->dev->pdev, 0, 0);`
	`148`	`+ if (!mem)`
	`149`	`+ return -ENOMEM;`
`148`	`150`
`149`	`151`	`mdev->mc.vram_size = mga_probe_vram(mdev, mem);`
`150`	`152`