diff --git a/src/gpio/gpio_chardev.c b/src/gpio/gpio_chardev.c
index 7f1f6e0..260a2ea 100644
--- a/src/gpio/gpio_chardev.c
+++ b/src/gpio/gpio_chardev.c
@@ -431,6 +431,8 @@ mraa_get_chip_infos(mraa_gpiod_chip_info*** cinfos)
         return -1;
     }
 
+    *cinfos = cinfo;
+
     /* Get chip info for all gpiochips present in the platform */
     for (i = 0; i < num_chips; i++) {
         cinfo[i] = mraa_get_chip_info_by_name(dirs[i]->d_name);
@@ -440,7 +442,5 @@ mraa_get_chip_infos(mraa_gpiod_chip_info*** cinfos)
         }
     }
 
-    *cinfos = cinfo;
-
     return num_chips;
 }