* grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout".

diff --git a/ChangeLog b/ChangeLog
index 9adefcfc00b35c578878b5f60fdbbe7b4f606434..e74072ccf067baf2f0ff8ae0f429929a2a71c0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout".
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/misc.h: Don't use warn_unused_result on gcc < 3.4.

diff --git a/grub-core/disk/dmraid_nvidia.c b/grub-core/disk/dmraid_nvidia.c
index 7b03e90362f859632042b500e07477f37710f589..4e7df43106ac4d69c30ece2e5025e65c00dd0be8 100644 (file)
--- a/grub-core/disk/dmraid_nvidia.c
+++ b/grub-core/disk/dmraid_nvidia.c
@@ -98,7 +98,6 @@ grub_dmraid_nv_detect (grub_disk_t disk,
   grub_disk_addr_t sector;
   struct grub_nv_super sb;
   int level;
-  int layout;
   grub_uint64_t disk_size;
   char *uuid;
 
@@ -139,7 +138,6 @@ grub_dmraid_nv_detect (grub_disk_t disk,
 
     case NV_LEVEL_5:
       level = 5;
-      layout = GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC;
       disk_size = sb.capacity / (sb.array.total_volumes - 1);
       break;
 
@@ -164,7 +162,8 @@ grub_dmraid_nv_detect (grub_disk_t disk,
   return grub_diskfilter_make_raid (sizeof (sb.array.signature),
                                    uuid, sb.array.total_volumes,
                                    NULL, disk_size,
-                                   sb.array.stripe_block_size, layout,
+                                   sb.array.stripe_block_size,
+                                   GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC,
                                    level);
 }