diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
| commit | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (patch) | |
| tree | 6b50ccc855dff4717749974630d258ba786811d0 /board/samsung/trats/trats.c | |
| parent | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (diff) | |
| parent | 5287d595449512385e25f5afcb68a130bf08bae6 (diff) | |
| download | u-boot-imx-304f936aeaab0c3cc9d5af438fd3498ac7682991.zip u-boot-imx-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.gz u-boot-imx-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.bz2 | |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
Diffstat (limited to 'board/samsung/trats/trats.c')
| -rw-r--r-- | board/samsung/trats/trats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index fec72d4..3dd340b 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -332,7 +332,7 @@ int exynos_power_init(void) if (!p_chrg->chrg->chrg_bat_present(p_chrg)) { puts("No battery detected\n"); - return -1; + return 0; } p_fg->fg->fg_battery_check(p_fg, p_bat); |