Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09552b26 authored by Feng Tang's avatar Feng Tang Committed by Ingo Molnar
Browse files

x86/mrst/vrtc: Fix boot crash in mrst_rtc_init() 



The sfi_mrtc_array[] only gets initialized when the sfi mrtc
table is parsed, so the vrtc_paddr should be initalized after it
too.

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1302140389-27603-1-git-send-email-feng.tang@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent de97a21a

arch/x86/platform/mrst/vrtc.c

+3 −1
Original line number Diff line number Diff line
@@ -100,9 +100,11 @@ int vrtc_set_mmss(unsigned long nowtime) 


void __init mrst_rtc_init(void)

{

	unsigned long vrtc_paddr = sfi_mrtc_array[0].phys_addr;

	unsigned long vrtc_paddr;



	sfi_table_parse(SFI_SIG_MRTC, NULL, NULL, sfi_parse_mrtc);



	vrtc_paddr = sfi_mrtc_array[0].phys_addr;

	if (!sfi_mrtc_num || !vrtc_paddr)

		return;