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

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

Fixes: d81ca730e3e4 ("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>

diff --git a/drivers/input/touchscreen/mxs-lradc-ts.c b/drivers/input/touchscreen/mxs-lradc-ts.c
index 4b4aebfe3e7fbfa282d15ae301a961c6c168e56e..58c016cd68098dbd54b7c3a56e5f62e06ed03211 100644 (file)
--- a/drivers/input/touchscreen/mxs-lradc-ts.c
+++ b/drivers/input/touchscreen/mxs-lradc-ts.c
@@ -642,7 +642,7 @@ static int mxs_lradc_ts_probe(struct platform_device *pdev)
        if (of_property_read_u32(node, "fsl,ave-ctrl", &adapt)) {
                ts->over_sample_cnt = 4;
        } else {
-               if (adapt >= 1 || adapt <= 32) {
+               if (adapt >= 1 && adapt <= 32) {
                        ts->over_sample_cnt = adapt;
                } else {
                        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)) {
                ts->over_sample_delay = 2;
        } else {
-               if (adapt >= 2 || adapt <= LRADC_DELAY_DELAY_MASK + 1) {
+               if (adapt >= 2 && adapt <= LRADC_DELAY_DELAY_MASK + 1) {
                        ts->over_sample_delay = adapt;
                } else {
                        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)) {
                ts->settling_delay = 10;
        } else {
-               if (adapt >= 1 || adapt <= LRADC_DELAY_DELAY_MASK) {
+               if (adapt >= 1 && adapt <= LRADC_DELAY_DELAY_MASK) {
                        ts->settling_delay = adapt;
                } else {
                        dev_err(ts->dev, "Invalid settling delay (%u)\n",