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

Commit 9e3ea19e authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/sclp: replace uninitialized early_event_mask_sccb variable with sccb_early 



Commit "s390/sclp: Consolidate early sclp init calls to sclp_early_detect()"
(7b50da53) replaced the sclp_event_mask_early()
with sclp_set_event_mask().  The early_event_mask_sccb variable is no longer
initialized but is still used in sclp_has_linemode() and sclp_has_vt220().

Replace early_event_mask_sccb with the sccb_early variable in both
functions.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b2b0154e

drivers/s390/char/sclp_early.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ struct read_info_sccb { 
	u8	_reserved5[4096 - 112];	/* 112-4095 */

	u8	_reserved5[4096 - 112];	/* 112-4095 */

} __packed __aligned(PAGE_SIZE);

} __packed __aligned(PAGE_SIZE);





static __initdata struct init_sccb early_event_mask_sccb __aligned(PAGE_SIZE);

static __initdata struct read_info_sccb early_read_info_sccb;

static __initdata struct read_info_sccb early_read_info_sccb;

static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);

static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);

static unsigned long sclp_hsa_size;

static unsigned long sclp_hsa_size;
@@ -113,7 +112,7 @@ static void __init sclp_facilities_detect(void) 




bool __init sclp_has_linemode(void)

bool __init sclp_has_linemode(void)

{

{

	struct init_sccb *sccb = &early_event_mask_sccb;

	struct init_sccb *sccb = (void *) &sccb_early;





	if (sccb->header.response_code != 0x20)

	if (sccb->header.response_code != 0x20)

		return 0;

		return 0;
@@ -126,7 +125,7 @@ bool __init sclp_has_linemode(void) 




bool __init sclp_has_vt220(void)

bool __init sclp_has_vt220(void)

{

{

	struct init_sccb *sccb = &early_event_mask_sccb;

	struct init_sccb *sccb = (void *) &sccb_early;





	if (sccb->header.response_code != 0x20)

	if (sccb->header.response_code != 0x20)

		return 0;

		return 0;