aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_pci.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2016-09-21 10:59:19 -0400
committerSean Paul <seanpaul@chromium.org>2016-09-22 07:03:48 -0400
commit0f2886057be322ddfa4858384c40a505f7a32a4a (patch)
tree95fd93e32cce031f99920cd1937b4e46491e65b3 /drivers/gpu/drm/drm_pci.c
parentc6bf811a0b55ab224fb2c75345641b4bb599475c (diff)
drm: Don't swallow error codes in drm_dev_alloc()
There are many reasons other than ENOMEM that drm_dev_init() can fail. Return ERR_PTR rather than NULL to be able to distinguish these in the caller. Signed-off-by: Tom Gundersen <teg@jklm.no> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/20160921145919.13754-2-teg@jklm.no
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
-rw-r--r--drivers/gpu/drm/drm_pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index d86362fc8ac6..3ceea9cb9d3e 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -236,8 +236,8 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
236 DRM_DEBUG("\n"); 236 DRM_DEBUG("\n");
237 237
238 dev = drm_dev_alloc(driver, &pdev->dev); 238 dev = drm_dev_alloc(driver, &pdev->dev);
239 if (!dev) 239 if (IS_ERR(dev))
240 return -ENOMEM; 240 return PTR_ERR(dev);
241 241
242 ret = pci_enable_device(pdev); 242 ret = pci_enable_device(pdev);
243 if (ret) 243 if (ret)