[PATCH 2/2] video: tegra: Incorrect operator used

[Andrew Goodbody]

Combining two bits into a mask requires the use of the binary 'or'
operator not the logical one. Correct it.

This issue was found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody at linaro.org>
---
 drivers/video/tegra/tegra124/sor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/tegra/tegra124/sor.c b/drivers/video/tegra/tegra124/sor.c
index 1ce5330c6bcf8750c5a5adb3c92ccd8743d01b59..ccdeefbcbb1edb15a4bacfbbe770da0f88f55300 100644
--- a/drivers/video/tegra/tegra124/sor.c
+++ b/drivers/video/tegra/tegra124/sor.c
@@ -336,7 +336,7 @@ static int tegra_dc_sor_io_set_dpd(struct tegra_dc_sor_data *sor, int up)
 	}
 
 	reg_val = readl(pmc_base + APBDEV_PMC_IO_DPD2_REQ);
-	reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON ||
+	reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
 			APBDEV_PMC_IO_DPD2_REQ_CODE_DEFAULT_MASK);
 
 	reg_val = up ? APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |

-- 
2.47.3