diff options
| author |   Aditya Pakki <pakki001@umn.edu> | 2019-12-15 13:43:44 -0600 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-12-17 17:26:08 +0100 |
| commit | 8b6fc114beeb9f1a270e5b6d25c30a5143801bf8 (patch) | |
| tree | a77e1a24914f58ad7893da22143e8f4846d88168 /drivers/gpu/drm/drm_drv.c | |
| parent | drm/mediatek: plane_state->fb iff plane_state->crtc (diff) | |
| download | linux-dev-8b6fc114beeb9f1a270e5b6d25c30a5143801bf8.tar.xz linux-dev-8b6fc114beeb9f1a270e5b6d25c30a5143801bf8.zip | |
drm: remove duplicate check on parent and avoid BUG_ON
In drm_dev_init, parent is checked for NULL via assert after
checked in devm_drm_dev_init(). The patch removes the duplicate
check and replaces the assertion with WARN_ON. Further, it returns
-EINVAL consistent with the usage in devm_drm_dev_init.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191215194345.4679-1-pakki001@umn.edu
Diffstat (limited to 'drivers/gpu/drm/drm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 1b9b40a1c7c9..7c18a980cd4b 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -622,7 +622,8 @@ int drm_dev_init(struct drm_device *dev, return -ENODEV; } - BUG_ON(!parent); + if (WARN_ON(!parent)) + return -EINVAL; kref_init(&dev->ref); dev->dev = get_device(parent); @@ -725,7 +726,7 @@ int devm_drm_dev_init(struct device *parent, { int ret; - if (WARN_ON(!parent || !driver->release)) + if (WARN_ON(!driver->release)) return -EINVAL; ret = drm_dev_init(dev, driver, parent); |