diff options
| author | Chris Wilson <[email protected]> | 2016-08-19 08:37:50 +0100 |
|---|---|---|
| committer | Sean Paul <[email protected]> | 2016-08-22 12:05:06 -0400 |
| commit | b4ba97e76763c4e582e3af1079e220e93b1b0d76 (patch) | |
| tree | ea85d8a800e620235819bd22cce664c7e7b884f3 | |
| parent | ec913f31a570b57e72e69b4122de70a6b2ef760f (diff) | |
drm: Avoid calling dev_printk(.dev = NULL)
Since dev_printk likes to print "(NULL device *):" when passed in a NULL
pointer, we have to manually call printk() ourselves.
Fixes: c4e68a583202 ("drm: Introduce DRM_DEV_* log messages")
Signed-off-by: Chris Wilson <[email protected]>
Cc: Eric Engestrom <[email protected]>
Cc: Sean Paul <[email protected]>
Signed-off-by: Sean Paul <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index a7f628298365..acf6a5f38920 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -79,8 +79,11 @@ void drm_dev_printk(const struct device *dev, const char *level, vaf.fmt = format; vaf.va = &args; - dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix, - &vaf); + if (dev) + dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix, + &vaf); + else + printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf); va_end(args); } |