diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 5d7f9b2444..30acaf12a5 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -466,14 +466,12 @@ static DRI2BufferPtr
 create_buffer(DRI2ScreenPtr ds, DrawablePtr pDraw,
               unsigned int attachment, unsigned int format)
 {
-    DRI2BufferPtr buffer;
     if (ds->CreateBuffer2)
-        buffer = (*ds->CreateBuffer2)(GetScreenPrime(pDraw->pScreen,
-                                                     DRI2GetDrawable(pDraw)->prime_id),
-                                      pDraw, attachment, format);
+        return ds->CreateBuffer2(GetScreenPrime(pDraw->pScreen,
+                                                 DRI2GetDrawable(pDraw)->prime_id),
+                                 pDraw, attachment, format);
     else
-        buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
-    return buffer;
+        return ds->CreateBuffer(pDraw, attachment, format);
 }
 
 static void