On Sun, 2013-01-06 at 00:13 +0000, David Woodhouse wrote:
> When booting under OVMF we have precisely one GOP device, and it
> implements the ConOut protocol.
> 
> We break out of the loop when we look at it... and then promptly abort
> because 'first_gop' never gets set. We should set first_gop *before*
> breaking out of the loop. Yes, it doesn't really mean "first" any more,
> but that doesn't matter. It's only a flag to indicate that a suitable
> GOP was found.
> 
> In fact, we'd do just as well to initialise 'width' to zero in this
> function, then just check *that* instead of first_gop. But I'll do the
> minimal fix for now (and for stable@).
> 
> Signed-off-by: David Woodhouse <[email protected]>
> Cc: [email protected]
> 
> diff --git a/arch/x86/boot/compressed/eboot.c 
> b/arch/x86/boot/compressed/eboot.c
> index c760e07..807330a 100644
> --- a/arch/x86/boot/compressed/eboot.c
> +++ b/arch/x86/boot/compressed/eboot.c
> @@ -314,10 +314,9 @@ static efi_status_t setup_gop(struct screen_info *si, 
> efi_guid_t *proto,
>                        * Once we've found a GOP supporting ConOut,
>                        * don't bother looking any further.
>                        */
> +                     first_gop = gop;
>                       if (conout_found)
>                               break;
> -
> -                     first_gop = gop;
>               }
>       }
>  
> 
> 

This looks good to me. Matthew?


--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to