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

Commit 212baf03 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: synaptics - do not abuse -1 as return value 



Let's stop using -1 as a universal return value and instead propagate
errors from underlying calls up the stack.

Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 991d29fe

drivers/input/mouse/synaptics.c

+46 −25
Original line number Diff line number Diff line
@@ -82,12 +82,17 @@ 
static int synaptics_mode_cmd(struct psmouse *psmouse, unsigned char mode)

{

	unsigned char param[1];

	int error;



	error = psmouse_sliced_command(psmouse, mode);

	if (error)

		return error;



	if (psmouse_sliced_command(psmouse, mode))

		return -1;

	param[0] = SYN_PS_SET_MODE2;

	if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_SETRATE))

		return -1;

	error = ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_SETRATE);

	if (error)

		return error;



	return 0;

}
@@ -534,16 +539,19 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse) 
{

	static unsigned char param = 0xc8;

	struct synaptics_data *priv = psmouse->private;

	int error;



	if (!(SYN_CAP_ADV_GESTURE(priv->info.ext_cap_0c) ||

	      SYN_CAP_IMAGE_SENSOR(priv->info.ext_cap_0c)))

		return 0;



	if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL))

		return -1;

	error = psmouse_sliced_command(psmouse, SYN_QUE_MODEL);

	if (error)

		return error;



	if (ps2_command(&psmouse->ps2dev, &param, PSMOUSE_CMD_SETRATE))

		return -1;

	error = ps2_command(&psmouse->ps2dev, &param, PSMOUSE_CMD_SETRATE);

	if (error)

		return error;



	/* Advanced gesture mode also sends multi finger data */

	priv->info.capabilities |= BIT(1);
@@ -554,6 +562,7 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse) 
static int synaptics_set_mode(struct psmouse *psmouse)

{

	struct synaptics_data *priv = psmouse->private;

	int error;



	priv->mode = 0;

	if (priv->absolute_mode)
@@ -565,13 +574,18 @@ static int synaptics_set_mode(struct psmouse *psmouse) 
	if (SYN_CAP_EXTENDED(priv->info.capabilities))

		priv->mode |= SYN_BIT_W_MODE;



	if (synaptics_mode_cmd(psmouse, priv->mode))

		return -1;

	error = synaptics_mode_cmd(psmouse, priv->mode);

	if (error)

		return error;



	if (priv->absolute_mode &&

	    synaptics_set_advanced_gesture_mode(psmouse)) {

		psmouse_err(psmouse, "Advanced gesture mode init failed.\n");

		return -1;

	if (priv->absolute_mode) {

		error = synaptics_set_advanced_gesture_mode(psmouse);

		if (error) {

			psmouse_err(psmouse,

				    "Advanced gesture mode init failed: %d\n",

				    error);

			return error;

		}

	}



	return 0;
@@ -598,12 +612,17 @@ static void synaptics_set_rate(struct psmouse *psmouse, unsigned int rate) 
static int synaptics_pt_write(struct serio *serio, unsigned char c)

{

	struct psmouse *parent = serio_get_drvdata(serio->parent);

	char rate_param = SYN_PS_CLIENT_CMD; /* indicates that we want pass-through port */

	u8 rate_param = SYN_PS_CLIENT_CMD; /* indicates that we want pass-through port */

	int error;



	error = psmouse_sliced_command(parent, c);

	if (error)

		return error;



	error = ps2_command(&parent->ps2dev, &rate_param, PSMOUSE_CMD_SETRATE);

	if (error)

		return error;



	if (psmouse_sliced_command(parent, c))

		return -1;

	if (ps2_command(&parent->ps2dev, &rate_param, PSMOUSE_CMD_SETRATE))

		return -1;

	return 0;

}
@@ -1380,19 +1399,21 @@ static int synaptics_reconnect(struct psmouse *psmouse) 
	} while (error && ++retry < 3);



	if (error)

		return -1;

		return error;



	if (retry > 1)

		psmouse_dbg(psmouse, "reconnected after %d tries\n", retry);



	if (synaptics_query_hardware(psmouse, &info)) {

	error = synaptics_query_hardware(psmouse, &info);

	if (error) {

		psmouse_err(psmouse, "Unable to query device.\n");

		return -1;

		return error;

	}



	if (synaptics_set_mode(psmouse)) {

	error = synaptics_set_mode(psmouse);

	if (error) {

		psmouse_err(psmouse, "Unable to initialize device.\n");

		return -1;

		return error;

	}



	if (info.identity != priv->info.identity ||
@@ -1405,7 +1426,7 @@ static int synaptics_reconnect(struct psmouse *psmouse) 
			    priv->info.model_id, info.model_id,

			    priv->info.capabilities, info.capabilities,

			    priv->info.ext_cap, info.ext_cap);

		return -1;

		return -ENXIO;

	}



	return 0;