diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:46:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:46:30 -0800 |
| commit | c8ec64b1cdf215937a39bd4548d169ff25fb066c (patch) | |
| tree | c132756624052ac1cc3c18f23a6c22356ef78e05 | |
| parent | 4bab93cb6e65194294d14d3269a2ac72ca4765d5 (diff) | |
| parent | 58b1979bfe8577013a9ca94aade1df6ad2d1e578 (diff) | |
Merge "msm: mdss: fix check for igc read"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index 30dd3c856c7f..c2be2cc7258d 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, 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 @@ -3980,8 +3980,7 @@ int mdss_mdp_igc_lut_config(struct msm_fb_data_type *mfd, disp_num = config->block - MDP_LOGICAL_BLOCK_DISP_0; if (config->ops & MDP_PP_OPS_READ) { - if (config->len != IGC_LUT_ENTRIES && - !pp_ops[IGC].pp_get_config) { + if (config->len != IGC_LUT_ENTRIES) { pr_err("invalid len for IGC table for read %d\n", config->len); return -EINVAL; |