diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-11-05 18:51:58 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-11-05 18:51:58 -0800 |
| commit | 2bd91ce10cb863369acd3878af47b4ad4a81d54f (patch) | |
| tree | 1d3a9dc91967e882e701408827445266fd0eee0a | |
| parent | 0cdd83de8519e514e0619414d78fe4b0c348d1c0 (diff) | |
| parent | a9494ec5ce0a3e279d4385d7a476d9abc2f5e398 (diff) | |
| download | display-2bd91ce10cb863369acd3878af47b4ad4a81d54f.tar.gz | |
Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15
SBMerger: 571992243
Change-Id: I50da12ffaac8d7f238fda8a4d8d686d1280a6d1a
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | samsung/cal_9865/dqe_reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samsung/cal_9865/dqe_reg.c b/samsung/cal_9865/dqe_reg.c index d9cfbab..b837eb2 100644 --- a/samsung/cal_9865/dqe_reg.c +++ b/samsung/cal_9865/dqe_reg.c @@ -801,7 +801,7 @@ void dqe_reg_get_histogram_bins(struct device *dev, u32 dqe_id, enum exynos_hist int regs_cnt = DIV_ROUND_UP(HISTOGRAM_BIN_COUNT, 2); int i; u32 val; - u16 dqe_channel = (dqe_id & 0xff << 8) | (hist_id & 0xff); + u16 dqe_channel = ((dqe_id & 0xff) << 8) | (hist_id & 0xff); phys_addr_t pa; dma_addr_t dma_addr; |