diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 62f11949fc..33e3e73b03 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -484,13 +484,11 @@ destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, int prime_id)
 static int
 find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
 {
-    int i;
-
     if (pPriv->buffers == NULL) {
         return -1;
     }
 
-    for (i = 0; i < pPriv->bufferCount; i++) {
+    for (int i = 0; i < pPriv->bufferCount; i++) {
         if ((pPriv->buffers[i] != NULL)
             && (pPriv->buffers[i]->attachment == attachment)) {
             return i;