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

Commit 6ccbcf2c authored by Tai-hwa Liang's avatar Tai-hwa Liang Committed by Dmitry Torokhov
Browse files

Input: sentelic - fix retrieving number of buttons 



Fixing wrong register offset which is used to retrieve the number of buttons
attached to the hardware.

Signed-off-by: default avatarTai-hwa Liang <avatar@sentelic.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent d9bae67a

drivers/input/mouse/sentelic.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Finger Sensing Pad PS/2 mouse driver.

 *

 * Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.

 * Copyright (C) 2005-2010 Tai-hwa Liang, Sentelic Corporation.

 * Copyright (C) 2005-2011 Tai-hwa Liang, Sentelic Corporation.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License
@@ -309,7 +309,7 @@ static int fsp_get_buttons(struct psmouse *psmouse, int *btn) 
	};

	int val;



	if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS1, &val) == -1)

	if (fsp_reg_read(psmouse, FSP_REG_TMOD_STATUS, &val) == -1)

		return -EIO;



	*btn = buttons[(val & 0x30) >> 4];

drivers/input/mouse/sentelic.h

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Finger Sensing Pad PS/2 mouse driver.

 *

 * Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.

 * Copyright (C) 2005-2009 Tai-hwa Liang, Sentelic Corporation.

 * Copyright (C) 2005-2011 Tai-hwa Liang, Sentelic Corporation.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License
@@ -33,6 +33,7 @@ 
/* Finger-sensing Pad control registers */

#define	FSP_REG_SYSCTL1		0x10

#define	FSP_BIT_EN_REG_CLK	BIT(5)

#define	FSP_REG_TMOD_STATUS	0x20

#define	FSP_REG_OPC_QDOWN	0x31

#define	FSP_BIT_EN_OPC_TAG	BIT(7)

#define	FSP_REG_OPTZ_XLO	0x34