Commit cc10b6ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 042bd1ff 5b39187f

drivers/input/mouse/synaptics.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {

drivers/input/touchscreen/w90p910_ts.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

include/linux/i8042.h

+6 −6
Original line number Diff line number Diff line
@@ -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;