diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-07 18:05:36 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 18:05:36 -0400 |
| commit | 17f545ca1769e268e0190d88ab94dc2a117df280 (patch) | |
| tree | 34b06d75d4c95823f7dbb0017142e5b59cd88f1b /arch/x86/platform/efi/efi.c | |
| parent | 2d403f7b198163d14a37ab79de33e27e390bb3b1 (diff) | |
| parent | 8341613afbc8d65bca8c81158edfb49f36b7ad92 (diff) | |
Merge branch 'dts-fixes-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/fixes
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 55856b2310d3..82089d8b1954 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
| @@ -206,7 +206,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size, | |||
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | if (boot_used_size && !finished) { | 208 | if (boot_used_size && !finished) { |
| 209 | unsigned long size; | 209 | unsigned long size = 0; |
| 210 | u32 attr; | 210 | u32 attr; |
| 211 | efi_status_t s; | 211 | efi_status_t s; |
| 212 | void *tmp; | 212 | void *tmp; |