dect
/
linux-2.6
Archived
13
0
Fork 0

OMAP: DSS2: Taal: Improve taal_power_on() error handling

Check return values and bail out on errors.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
Jani Nikula 2010-04-09 14:15:12 +03:00 committed by Tomi Valkeinen
parent d803bb6e68
commit f2a8b75c13
1 changed files with 23 additions and 7 deletions

View File

@ -696,16 +696,32 @@ static int taal_power_on(struct omap_dss_device *dssdev)
if (id2 == 0x00 || id2 == 0xff || id2 == 0x81)
td->cabc_broken = true;
taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
taal_dcs_write_1(DCS_CTRL_DISPLAY, (1<<2) | (1<<5)); /* BL | BCTRL */
r = taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
if (r)
goto err;
taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
r = taal_dcs_write_1(DCS_CTRL_DISPLAY,
(1<<2) | (1<<5)); /* BL | BCTRL */
if (r)
goto err;
taal_set_addr_mode(td->rotate, td->mirror);
if (!td->cabc_broken)
taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
r = taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
if (r)
goto err;
taal_dcs_write_0(DCS_DISPLAY_ON);
r = taal_set_addr_mode(td->rotate, td->mirror);
if (r)
goto err;
if (!td->cabc_broken) {
r = taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
if (r)
goto err;
}
r = taal_dcs_write_0(DCS_DISPLAY_ON);
if (r)
goto err;
r = _taal_enable_te(dssdev, td->te_enabled);
if (r)