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

Commit 31f6e1bd 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: ads7846 - SPI_CPHA mode bugfix
  Input: ads7846 - document that it handles tsc2046 too
  Input: input-polldev - add module info
  Input: ucb1x00-ts - remove commented out code
  Input: ucb1400_ts - use sched_setscheduler()
  Input: ALPS - force stream mode
  Input: iforce - minor clean-ups
  Input: iforce - fix force feedback not working
  Input: adbhid - do not access input_dev->private directly
  Input: logips2pp - add type 72 (PS/2 TrackMan Marble)
parents ad9ddd66 230ffc8e

drivers/input/joystick/iforce/iforce-main.c

+1 −3
Original line number Diff line number Diff line
@@ -370,10 +370,8 @@ int iforce_init_device(struct iforce *iforce) 


/*

 * Disable spring, enable force feedback.

 * FIXME: We should use iforce_set_autocenter() et al here.

 */



	iforce_send_packet(iforce, FF_CMD_AUTOCENTER, "\004\000");

	iforce_set_autocenter(input_dev, 0);



/*

 * Find appropriate device entry

drivers/input/joystick/iforce/iforce-packets.c

+8 −2
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) 


int iforce_get_id_packet(struct iforce *iforce, char *packet)

{

	int status;



	switch (iforce->bus) {



	case IFORCE_USB:
@@ -254,18 +256,22 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 
		iforce->cr.bRequest = packet[0];

		iforce->ctrl->dev = iforce->usbdev;



		if (usb_submit_urb(iforce->ctrl, GFP_ATOMIC))

		status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);

		if (status) {

			err("usb_submit_urb failed %d", status);

			return -1;

		}



		wait_event_interruptible_timeout(iforce->wait,

			iforce->ctrl->status != -EINPROGRESS, HZ);



		if (iforce->ctrl->status) {

			dbg("iforce->ctrl->status = %d", iforce->ctrl->status);

			usb_unlink_urb(iforce->ctrl);

			return -1;

		}

#else

		err("iforce_get_id_packet: iforce->bus = USB!");

		dbg("iforce_get_id_packet: iforce->bus = USB!");

#endif

		break;

drivers/input/joystick/iforce/iforce-usb.c

+3 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void iforce_usb_xmit(struct iforce *iforce) 
	XMIT_INC(iforce->xmit.tail, n);



	if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {

		clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

		warn("usb_submit_urb failed %d\n", n);

	}
@@ -163,8 +164,8 @@ static int iforce_usb_probe(struct usb_interface *intf, 
	usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),

			iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);



	usb_fill_bulk_urb(iforce->out, dev, usb_sndbulkpipe(dev, epout->bEndpointAddress),

			iforce + 1, 32, iforce_usb_out, iforce);

	usb_fill_int_urb(iforce->out, dev, usb_sndintpipe(dev, epout->bEndpointAddress),

			iforce + 1, 32, iforce_usb_out, iforce, epout->bInterval);



	usb_fill_control_urb(iforce->ctrl, dev, usb_rcvctrlpipe(dev, 0),

			(void*) &iforce->cr, iforce->edata, 16, iforce_usb_ctrl, iforce);

drivers/input/misc/input-polldev.c

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ 
#include <linux/mutex.h>

#include <linux/input-polldev.h>



MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>");

MODULE_DESCRIPTION("Generic implementation of a polled input device");

MODULE_LICENSE("GPL v2");

MODULE_VERSION("0.1");



static DEFINE_MUTEX(polldev_mutex);

static int polldev_users;

static struct workqueue_struct *polldev_wq;

drivers/input/mouse/alps.c

+31 −27
Original line number Diff line number Diff line
@@ -251,11 +251,15 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int 


	dbg("E7 report: %2.2x %2.2x %2.2x", param[0], param[1], param[2]);



	for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++);

	if (version) {

		for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++)

			/* empty */;

		*version = (param[0] << 8) | (param[1] << 4) | i;

	}



	for (i = 0; i < ARRAY_SIZE(alps_model_data); i++)

		if (!memcmp(param, alps_model_data[i].signature, sizeof(alps_model_data[i].signature)))

		if (!memcmp(param, alps_model_data[i].signature,

			    sizeof(alps_model_data[i].signature)))

			return alps_model_data + i;



	return NULL;
@@ -380,32 +384,46 @@ static int alps_poll(struct psmouse *psmouse) 
	return 0;

}



static int alps_reconnect(struct psmouse *psmouse)

static int alps_hw_init(struct psmouse *psmouse, int *version)

{

	struct alps_data *priv = psmouse->private;

	int version;



	psmouse_reset(psmouse);



	if (!(priv->i = alps_get_model(psmouse, &version)))

	priv->i = alps_get_model(psmouse, version);

	if (!priv->i)

		return -1;



	if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))

		return -1;



	if (alps_tap_mode(psmouse, 1)) {

		printk(KERN_WARNING "alps.c: Failed to reenable hardware tapping\n");

		printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");

		return -1;

	}



	if (alps_absolute_mode(psmouse)) {

		printk(KERN_ERR "alps.c: Failed to reenable absolute mode\n");

		printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");

		return -1;

	}



	if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0))

		return -1;



	/* ALPS needs stream mode, otherwise it won't report any data */

	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSTREAM)) {

		printk(KERN_ERR "alps.c: Failed to enable stream mode\n");

		return -1;

	}



	return 0;

}



static int alps_reconnect(struct psmouse *psmouse)

{

	psmouse_reset(psmouse);



	if (alps_hw_init(psmouse, NULL))

		return -1;



	return 0;

}
@@ -430,23 +448,9 @@ int alps_init(struct psmouse *psmouse) 
		goto init_fail;



	priv->dev2 = dev2;

	psmouse->private = priv;



	priv->i = alps_get_model(psmouse, &version);

	if (!priv->i)

		goto init_fail;



	if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))

		goto init_fail;



	if (alps_tap_mode(psmouse, 1))

		printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");



	if (alps_absolute_mode(psmouse)) {

		printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");

		goto init_fail;

	}



	if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0))

	if (alps_hw_init(psmouse, &version))

		goto init_fail;



	dev1->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
@@ -493,13 +497,13 @@ int alps_init(struct psmouse *psmouse) 
	/* We are having trouble resyncing ALPS touchpads so disable it for now */

	psmouse->resync_time = 0;



	psmouse->private = priv;

	return 0;



init_fail:

	psmouse_reset(psmouse);

	input_free_device(dev2);

	kfree(priv);

	psmouse->private = NULL;

	return -1;

}