diff --git a/cpukit/dev/flash/flashdev.c b/cpukit/dev/flash/flashdev.c
index 6cea723f6e..4f00a17cdc 100644
--- a/cpukit/dev/flash/flashdev.c
+++ b/cpukit/dev/flash/flashdev.c
@@ -783,7 +783,7 @@ static int rtems_flashdev_ioctl_create_region(
   rtems_flashdev_region *region_in
 )
 {
-  int i;
+  uint32_t i;
   rtems_flashdev_region_table *table = flash->region_table;
 
   /* Find unallocated region slot */
@@ -1260,7 +1260,7 @@ static uint32_t rtems_flashdev_find_unallocated_region(
 )
 {
   int array_index = 0;
-  int bit_index = 0;
+  uint32_t bit_index = 0;
   int shift;
 
   while ( bit_index < region_table->max_regions) {
diff --git a/cpukit/include/dev/flash/flashdev.h b/cpukit/include/dev/flash/flashdev.h
index 906f48ead9..66a5903baf 100644
--- a/cpukit/include/dev/flash/flashdev.h
+++ b/cpukit/include/dev/flash/flashdev.h
@@ -268,7 +268,7 @@ typedef struct rtems_flashdev_region_table {
   /**
    * @brief The maximum regions that can be defined at once.
    */
-  int max_regions;
+  uint32_t max_regions;
 
   /**
    * @brief Pointer to array of rtems_flashdev_region of length