diff --git a/src/intel/tools/i965_disasm.c b/src/intel/tools/i965_disasm.c
index 401ca860cb4..3c8eaff33ea 100644
--- a/src/intel/tools/i965_disasm.c
+++ b/src/intel/tools/i965_disasm.c
@@ -38,10 +38,10 @@ enum opt_input_type {
 static enum opt_input_type input_type = OPT_INPUT_BINARY;
 
 /* Return size of file in bytes pointed by fp */
-static size_t
+static long
 i965_disasm_get_file_size(FILE *fp)
 {
-   size_t size;
+   long size;
 
    fseek(fp, 0L, SEEK_END);
    size = ftell(fp);
@@ -93,7 +93,11 @@ i965_disasm_read_binary(FILE *fp, size_t *end)
    size_t size;
    void *assembly;
 
-   *end = i965_disasm_get_file_size(fp);
+   long sz = i965_disasm_get_file_size(fp);
+   if (sz < 0)
+      return NULL;
+
+   *end = (size_t)sz;
    if (!*end)
       return NULL;