From 0816c5482c25251da8af5978cc348e1c547bf731 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 1 Dec 2009 11:04:06 -0800
Subject: [PATCH] Revert "fb: Don't crash if copy_drawable() returns NULL."

This reverts commit 66a9616d645f5a23225251d197e00b94c79274f6.

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
---
 fb/fbpict.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 7ae3ec5fd..2fbef15c3 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -329,11 +329,9 @@ create_bits_picture (PicturePtr pict,
     pixman_image_t *image;
     DrawablePtr drawable;
 
-    if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW) {
+    if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW)
 	drawable = copy_drawable (pict->pDrawable);
-	if (!drawable)
-	    return NULL;
-    } else
+    else
 	drawable = pict->pDrawable;
     
     fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);