diff --git a/[refs] b/[refs]
index 56328662821d..b5f49f7746f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 185abeccabe5aed0ef79e8572c3916ea08034a45
+refs/heads/master: 2941482ead0b02c9efd81fc3862be3ebfce607a5
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c b/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
index de34b6bb059f..f240ba241943 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c
@@ -197,6 +197,9 @@ nouveau_ramht_find(struct nouveau_channel *chan, u32 handle)
 	struct nouveau_gpuobj *gpuobj = NULL;
 	unsigned long flags;
 
+	if (unlikely(!chan->ramht))
+		return NULL;
+
 	spin_lock_irqsave(&ramht->lock, flags);
 	list_for_each_entry(entry, &chan->ramht->entries, head) {
 		if (entry->channel == chan && entry->handle == handle) {