leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: iforce - minor clean-ups

Browse Source 
Signed-off-by: Johann Deneux <johann.deneux@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Johann Deneux 2007-05-14 00:09:33 -04:00 committed by Dmitry Torokhov
parent b8691fd225
commit c0338c1597
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/joystick/iforce/iforce-main.c
View File

@ -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

10
drivers/input/joystick/iforce/iforce-packets.c
View File

@ -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;