From 757e3eb7c3f6a14788aa113401beb72b7581f063 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 18 Oct 2013 16:36:09 +0200 Subject: [PATCH] * grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout". --- ChangeLog | 4 ++++ grub-core/disk/dmraid_nvidia.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9adefcfc0..e74072ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-18 Vladimir Serbinenko + + * grub-core/disk/dmraid_nvidia.c: Fix potentially uninited "layout". + 2013-10-18 Vladimir Serbinenko * 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 7b03e9036..4e7df4310 100644 --- 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); }