Commit 733345ec authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: panel: initialize lcd if lcd enabled 



initialiaze lcd parameters only if lcd is enabled.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f43de77c

drivers/staging/panel/panel.c

+22 −19
Original line number Diff line number Diff line
@@ -2321,25 +2321,6 @@ static int __init panel_init_module(void) 
		break;

	}



	/*

	 * Init lcd struct with load-time values to preserve exact current

	 * functionality (at least for now).

	 */

	lcd.height = lcd_height;

	lcd.width = lcd_width;

	lcd.bwidth = lcd_bwidth;

	lcd.hwidth = lcd_hwidth;

	lcd.charset = lcd_charset;

	lcd.proto = lcd_proto;

	lcd.pins.e = lcd_e_pin;

	lcd.pins.rs = lcd_rs_pin;

	lcd.pins.rw = lcd_rw_pin;

	lcd.pins.cl = lcd_cl_pin;

	lcd.pins.da = lcd_da_pin;

	lcd.pins.bl = lcd_bl_pin;



	/* Leave it for now, just in case */

	lcd.esc_seq.len = -1;



	/*

	 * Overwrite selection with module param values (both keypad and lcd),
@@ -2359,6 +2340,28 @@ static int __init panel_init_module(void) 


	lcd.enabled = (selected_lcd_type > 0);



	if (lcd.enabled) {

		/*

		 * Init lcd struct with load-time values to preserve exact

		 * current functionality (at least for now).

		 */

		lcd.height = lcd_height;

		lcd.width = lcd_width;

		lcd.bwidth = lcd_bwidth;

		lcd.hwidth = lcd_hwidth;

		lcd.charset = lcd_charset;

		lcd.proto = lcd_proto;

		lcd.pins.e = lcd_e_pin;

		lcd.pins.rs = lcd_rs_pin;

		lcd.pins.rw = lcd_rw_pin;

		lcd.pins.cl = lcd_cl_pin;

		lcd.pins.da = lcd_da_pin;

		lcd.pins.bl = lcd_bl_pin;



		/* Leave it for now, just in case */

		lcd.esc_seq.len = -1;

	}



	switch (selected_keypad_type) {

	case KEYPAD_TYPE_OLD:

		keypad_profile = old_keypad_profile;