Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab6241ae authored by Dan Carpenter's avatar Dan Carpenter Committed by Lee Jones
Browse files

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: d81ca730 ("input: touchscreen: mxs-lradc: Add support for touchscreen")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent d096ae4b

drivers/input/touchscreen/mxs-lradc-ts.c

+3 −3
Original line number Diff line number Diff line
@@ -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",