redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: w90p910_ts - fix call to setup_timer()
  Input: synaptics - fix wrong dimensions check
  Input: i8042 - mark stubs in i8042.h "static inline"
wifi-calibration
Linus Torvalds 2010-07-16 08:22:40 -07:00
parent 042bd1ff6c 5b39187fad
commit cc10b6ffd3
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/input/mouse/synaptics.c
View File

@ -206,6 +206,7 @@ static int synaptics_resolution(struct psmouse *psmouse)
unsigned char max[3];
if (SYN_ID_MAJOR(priv->identity) < 4)
return 0;
if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {
if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {

2
drivers/input/touchscreen/w90p910_ts.c
View File

@ -233,7 +233,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev)
w90p910_ts->state = TS_IDLE;
spin_lock_init(&w90p910_ts->lock);
setup_timer(&w90p910_ts->timer, w90p910_check_pen_up,
(unsigned long)&w90p910_ts);
(unsigned long)w90p910_ts);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {

12
include/linux/i8042.h
View File

@ -46,31 +46,31 @@ int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
#else
void i8042_lock_chip(void)
static inline void i8042_lock_chip(void)
{
}
void i8042_unlock_chip(void)
static inline void i8042_unlock_chip(void)
{
}
int i8042_command(unsigned char *param, int command)
static inline int i8042_command(unsigned char *param, int command)
{
return -ENODEV;
}
bool i8042_check_port_owner(const struct serio *serio)
static inline bool i8042_check_port_owner(const struct serio *serio)
{
return false;
}
int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
static inline int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
struct serio *serio))
{
return -ENODEV;
}
int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
static inline int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
struct serio *serio))
{
return -ENODEV;