From 057f56a57770b0d4350e585ef3e0dc66df99beb6 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 9 Jan 2018 14:23:04 +0000 Subject: lock->ctx != NULL => lock->ctx requested by kettenis@ --- sys/dev/pci/drm/linux_ww_mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/linux_ww_mutex.h b/sys/dev/pci/drm/linux_ww_mutex.h index fb1b26791f6..4476af7830b 100644 --- a/sys/dev/pci/drm/linux_ww_mutex.h +++ b/sys/dev/pci/drm/linux_ww_mutex.h @@ -164,7 +164,7 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx, bool slow, bo * resources. */ if (slow || ctx == NULL || - (lock->ctx != NULL && ctx->stamp < lock->ctx->stamp)) { + (lock->ctx && ctx->stamp < lock->ctx->stamp)) { int s = msleep(lock, &lock->lock, intr ? PCATCH : 0, ctx ? ctx->ww_class->name : "ww_mutex_lock", 0); -- cgit v1.2.3