diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:33:49 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:33:49 +0300 |
| commit | d1cc3341f2d95b742bb075e309251fc2ae62a799 (patch) | |
| tree | 3f18735cd1a957309bf983d04bd76a01f3011258 /drivers/power | |
| parent | afe5d56d4f6580fccf499c4b552696ca4fea1768 (diff) | |
| parent | 684f18e29d4d2aba9b8155b3c2c1113ee5650b23 (diff) | |
Merge tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998
* tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
msm: adsprpc: Fix array index underflow problem
profiler: Fix compilation errors
fbdev: msm: fix ret value while translating to mdp format
clk: msm: Fix compilation errors with clang
ath10k: Fix compilation issue
drm/msm/sde: Fix clang compilation in SDE driver
ais: cam_soc_api: Fix compilation error
msm: camera: reset atomic variable
msm: v4l2loopback: Fix clang compilation error
msm: Fix compilation error
asoc: msm-8998: Add new FE's for TDM Primary
diag: dci: Synchronize dci mempool buffers alloc and free
headers_lib: rename Android.bp
kbuild: skip install/check of headers right under uapi directories
uapi: export all arch specifics directories
kernel_headers: Fix headers not detected in incremental builds
kernel headers: Update comparison logic
Kbuild : Use no-export-headers to avoid exporting headers
kernel_headers: kernel headers library package
kbuild: replace genhdr-y with generated-y
uapi: export all headers under uapi directories
uapi: sound: move necessary sound headers under uapi
kernel: Fix build errors with LLVM
Revert "ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996."
ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996.
input: touchpanel: Fix compilation errors with clang
asoc: msm-8998: TDM device grouping changes for capture path
kbuild, x86: Track generated headers with generated-y
kbuild: Remove stale asm-generic wrappers
ARM: put types.h in uapi
msm: ais: jpegdma: Fix uninitialized variable
Makefile.headersinst: remove destination-y option
msm: adsprpc: DSP device node to provide restricted access to ADSP/SLPI
Conflicts:
.gitignore
drivers/mmc/core/sdio_cis.c
Change-Id: I70cf2a0fbcfcbc834a21cf7fa8db9bd2e1c755b1
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/qcom/msm_bcl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/supply/qcom/msm_bcl.c b/drivers/power/supply/qcom/msm_bcl.c index aea3f4645897..843cb415e810 100644 --- a/drivers/power/supply/qcom/msm_bcl.c +++ b/drivers/power/supply/qcom/msm_bcl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014, 2017, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -227,8 +227,8 @@ int msm_bcl_enable(void) int ret = 0, i = 0; struct bcl_param_data *param_data = NULL; - if (!bcl[i] || !bcl[BCL_PARAM_VOLTAGE]->thresh - || !bcl[BCL_PARAM_CURRENT]->thresh) { + if (!bcl[i] || (bcl[BCL_PARAM_VOLTAGE]->thresh == NULL) + || (bcl[BCL_PARAM_CURRENT]->thresh == NULL)) { pr_err("BCL not initialized\n"); return -EINVAL; } |