evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: bcm5974 - turn wellspring mode off if failed to start traffic

Browse source 
If we fail to submit URBs we should take touchpad out of wellsping
mode.

Signed-off-by: Luo Jinghua <sunmoon1997@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Luo Jinghua 2010-06-08 01:01:48 -07:00 • committed by Dmitry Torokhov
parent 4aa5bbeca0
commit 1719ec4136
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/input/mouse/bcm5974.c
View file

@ -580,23 +580,30 @@ exit:
*/ */
static int bcm5974_start_traffic(struct bcm5974 *dev) static int bcm5974_start_traffic(struct bcm5974 *dev)
{ {
if (bcm5974_wellspring_mode(dev, true)) { int error;
error = bcm5974_wellspring_mode(dev, true);
if (error) {
dprintk(1, "bcm5974: mode switch failed\n"); dprintk(1, "bcm5974: mode switch failed\n");
goto error; goto err_out;
} }
if (usb_submit_urb(dev->bt_urb, GFP_KERNEL)) error = usb_submit_urb(dev->bt_urb, GFP_KERNEL);
goto error; if (error)
goto err_reset_mode;
if (usb_submit_urb(dev->tp_urb, GFP_KERNEL)) error = usb_submit_urb(dev->tp_urb, GFP_KERNEL);
if (error)
goto err_kill_bt; goto err_kill_bt;
return 0; return 0;
err_kill_bt: err_kill_bt:
usb_kill_urb(dev->bt_urb); usb_kill_urb(dev->bt_urb);
error: err_reset_mode:
return -EIO; bcm5974_wellspring_mode(dev, false);
err_out:
return error;
} }
static void bcm5974_pause_traffic(struct bcm5974 *dev) static void bcm5974_pause_traffic(struct bcm5974 *dev)