leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: touchscreen: mxs-lradc: || vs && typos

Browse Source 
These tests are meaningless as is because "adapt" can't possibly be both
less than 1 and greater than 32.

Fixes: d81ca730e3 ("input: touchscreen: mxs-lradc: Add support for touchscreen")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Dan Carpenter 2017-04-27 00:04:31 +03:00 committed by Lee Jones
parent d096ae4bb0
commit ab6241ae07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/touchscreen/mxs-lradc-ts.c
View File

@ -642,7 +642,7 @@ static int mxs_lradc_ts_probe(struct platform_device *pdev)
if (of_property_read_u32(node, "fsl,ave-ctrl", &adapt)) { if (of_property_read_u32(node, "fsl,ave-ctrl", &adapt)) {
ts->over_sample_cnt = 4; ts->over_sample_cnt = 4;
} else { } else {
if (adapt >= 1 || adapt <= 32) { if (adapt >= 1 && adapt <= 32) {
ts->over_sample_cnt = adapt; ts->over_sample_cnt = adapt;
} else { } else {
dev_err(ts->dev, "Invalid sample count (%u)\n", dev_err(ts->dev, "Invalid sample count (%u)\n",
@ -654,7 +654,7 @@ static int mxs_lradc_ts_probe(struct platform_device *pdev)
if (of_property_read_u32(node, "fsl,ave-delay", &adapt)) { if (of_property_read_u32(node, "fsl,ave-delay", &adapt)) {
ts->over_sample_delay = 2; ts->over_sample_delay = 2;
} else { } else {
if (adapt >= 2 || adapt <= LRADC_DELAY_DELAY_MASK + 1) { if (adapt >= 2 && adapt <= LRADC_DELAY_DELAY_MASK + 1) {
ts->over_sample_delay = adapt; ts->over_sample_delay = adapt;
} else { } else {
dev_err(ts->dev, "Invalid sample delay (%u)\n", dev_err(ts->dev, "Invalid sample delay (%u)\n",
@ -666,7 +666,7 @@ static int mxs_lradc_ts_probe(struct platform_device *pdev)
if (of_property_read_u32(node, "fsl,settling", &adapt)) { if (of_property_read_u32(node, "fsl,settling", &adapt)) {
ts->settling_delay = 10; ts->settling_delay = 10;
} else { } else {
if (adapt >= 1 || adapt <= LRADC_DELAY_DELAY_MASK) { if (adapt >= 1 && adapt <= LRADC_DELAY_DELAY_MASK) {
ts->settling_delay = adapt; ts->settling_delay = adapt;
} else { } else {
dev_err(ts->dev, "Invalid settling delay (%u)\n", dev_err(ts->dev, "Invalid settling delay (%u)\n",