diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c index e4793df..254a099 100644 --- a/drivers/video/backlight/s6e63m0.c +++ b/drivers/video/backlight/s6e63m0.c @@ -420,13 +420,25 @@ static int _s6e63m0_gamma_ctl(struct s6e63m0 *lcd, const unsigned int *gamma) /* disable gamma table updating. */ ret = s6e63m0_spi_write(lcd, 0xfa, 0x00); + if (ret) { + dev_err(lcd->dev, "failed to disable gamma table updating.\n"); + goto gamma_err; + } - for (i = 0 ; i < GAMMA_TABLE_COUNT; i++) - ret |= s6e63m0_spi_write(lcd, DATA_ONLY, gamma[i]); + for (i = 0 ; i < GAMMA_TABLE_COUNT; i++) { + ret = s6e63m0_spi_write(lcd, DATA_ONLY, gamma[i]); + if (ret) { + dev_err(lcd->dev, "failed to set gamma table.\n"); + goto gamma_err; + } + } /* update gamma table. */ - ret |= s6e63m0_spi_write(lcd, 0xfa, 0x01); + ret = s6e63m0_spi_write(lcd, 0xfa, 0x01); + if (ret) + dev_err(lcd->dev, "failed to update gamma table.\n"); +gamma_err: return ret; } @@ -442,24 +454,38 @@ static int s6e63m0_gamma_ctl(struct s6e63m0 *lcd, int gamma) static int s6e63m0_ldi_init(struct s6e63m0 *lcd) { - int ret; + int ret, i; + const unsigned short *init_seq[] = { + SEQ_PANEL_CONDITION_SET, + SEQ_DISPLAY_CONDITION_SET, + SEQ_GAMMA_SETTING, + SEQ_ETC_CONDITION_SET, + SEQ_ACL_ON, + SEQ_ELVSS_ON, + }; - ret = s6e63m0_panel_send_sequence(lcd, SEQ_PANEL_CONDITION_SET); - ret |= s6e63m0_panel_send_sequence(lcd, SEQ_DISPLAY_CONDITION_SET); - ret |= s6e63m0_panel_send_sequence(lcd, SEQ_GAMMA_SETTING); - ret |= s6e63m0_panel_send_sequence(lcd, SEQ_ETC_CONDITION_SET); - ret |= s6e63m0_panel_send_sequence(lcd, SEQ_ACL_ON); - ret |= s6e63m0_panel_send_sequence(lcd, SEQ_ELVSS_ON); + for (i = 0; i < ARRAY_SIZE(init_seq); i++) { + ret = s6e63m0_panel_send_sequence(lcd, init_seq[i]); + if (ret) + break; + } return ret; } static int s6e63m0_ldi_enable(struct s6e63m0 *lcd) { - int ret = 0; + int ret = 0, i; + const unsigned short *enable_seq[] = { + SEQ_STAND_BY_OFF, + SEQ_DISPLAY_ON, + }; - ret = s6e63m0_panel_send_sequence(lcd, SEQ_STAND_BY_OFF); - ret = s6e63m0_panel_send_sequence(lcd, SEQ_DISPLAY_ON); + for (i = 0; i < ARRAY_SIZE(enable_seq); i++) { + ret = s6e63m0_panel_send_sequence(lcd, enable_seq[i]); + if (ret) + break; + } return ret; } @@ -508,12 +534,22 @@ static int s6e63m0_power_on(struct s6e63m0 *lcd) } ret = s6e63m0_ldi_init(lcd); - ret |= s6e63m0_ldi_enable(lcd); + if (ret) { + dev_err(lcd->dev, "failed to initialize ldi.\n"); + return ret; + } + + ret = s6e63m0_ldi_enable(lcd); + if (ret) { + dev_err(lcd->dev, "failed to enable ldi.\n"); + return ret; + } + /* set brightness to current value after power on or resume. */ - ret |= s6e63m0_gamma_ctl(lcd, bd->props.brightness); + ret = s6e63m0_gamma_ctl(lcd, bd->props.brightness); if (ret) { dev_err(lcd->dev, "lcd gamma setting failed.\n"); - return -EIO; + return ret; } return 0;